diff --git a/.d/f/.gitignore b/.d/jets/a/.gitignore
similarity index 100%
rename from .d/f/.gitignore
rename to .d/jets/a/.gitignore
diff --git a/.d/j/a/.gitignore b/.d/jets/b/.gitignore
similarity index 100%
rename from .d/j/a/.gitignore
rename to .d/jets/b/.gitignore
diff --git a/.d/j/b/.gitignore b/.d/jets/c/.gitignore
similarity index 100%
rename from .d/j/b/.gitignore
rename to .d/jets/c/.gitignore
diff --git a/.d/j/c/.gitignore b/.d/jets/d/.gitignore
similarity index 100%
rename from .d/j/c/.gitignore
rename to .d/jets/d/.gitignore
diff --git a/.d/j/d/.gitignore b/.d/jets/e/.gitignore
similarity index 100%
rename from .d/j/d/.gitignore
rename to .d/jets/e/.gitignore
diff --git a/.d/j/e/.gitignore b/.d/jets/f/.gitignore
similarity index 100%
rename from .d/j/e/.gitignore
rename to .d/jets/f/.gitignore
diff --git a/.d/j/f/.gitignore b/.d/jets/g/.gitignore
similarity index 100%
rename from .d/j/f/.gitignore
rename to .d/jets/g/.gitignore
diff --git a/.d/j/g/.gitignore b/.d/noun/.gitignore
similarity index 100%
rename from .d/j/g/.gitignore
rename to .d/noun/.gitignore
diff --git a/.d/v/.gitignore b/.d/v/.gitignore
deleted file mode 100644
index e69de29bb..000000000
diff --git a/.d/n/.gitignore b/.d/vere/.gitignore
similarity index 100%
rename from .d/n/.gitignore
rename to .d/vere/.gitignore
diff --git a/Makefile b/Makefile
index 2ee788884..e692e9d2a 100644
--- a/Makefile
+++ b/Makefile
@@ -67,7 +67,7 @@ else
 LIBS=-lssl -lcrypto -lgmp -lncurses -lsigsegv $(OSLIBS)
 endif
 
-INCLUDE=i
+INCLUDE=include
 MDEFINES=-DU3_OS_$(OS) -DU3_OS_ENDIAN_$(ENDIAN) -D U3_LIB=\"$(LIB)\"
 
 # NOTFORCHECKIN - restore -O3
@@ -113,165 +113,169 @@ else
 endif
 
 N_OFILES=\
-       n/a.o \
-       n/e.o \
-       n/h.o \
-       n/i.o \
-       n/j.o \
-       n/m.o \
-       n/n.o \
-       n/r.o \
-       n/t.o \
-       n/x.o \
-       n/v.o \
-       n/z.o
+       noun/allocate.o \
+       noun/events.o \
+       noun/hashtable.o \
+       noun/imprison.o \
+       noun/jets.o \
+       noun/manage.o \
+       noun/nock.o \
+       noun/retrieve.o \
+       noun/trace.o \
+       noun/xtract.o \
+       noun/vortex.o \
+       noun/zave.o
 
 J_A_OFILES=\
-       j/a/add.o \
-       j/a/dec.o \
-       j/a/div.o \
-       j/a/gte.o \
-       j/a/gth.o \
-       j/a/lte.o \
-       j/a/lth.o \
-       j/a/mod.o \
-       j/a/mul.o \
-       j/a/sub.o
+       jets/a/add.o \
+       jets/a/dec.o \
+       jets/a/div.o \
+       jets/a/gte.o \
+       jets/a/gth.o \
+       jets/a/lte.o \
+       jets/a/lth.o \
+       jets/a/mod.o \
+       jets/a/mul.o \
+       jets/a/sub.o
 
 J_B_OFILES=\
-       j/b/bind.o \
-       j/b/clap.o \
-       j/b/drop.o \
-       j/b/flop.o \
-       j/b/lent.o \
-       j/b/levy.o \
-       j/b/lien.o \
-       j/b/need.o \
-       j/b/reel.o \
-       j/b/roll.o \
-       j/b/skim.o \
-       j/b/skip.o \
-       j/b/scag.o \
-       j/b/slag.o \
-       j/b/snag.o \
-       j/b/sort.o \
-       j/b/turn.o \
-       j/b/weld.o
+       jets/b/bind.o \
+       jets/b/clap.o \
+       jets/b/drop.o \
+       jets/b/flop.o \
+       jets/b/lent.o \
+       jets/b/levy.o \
+       jets/b/lien.o \
+       jets/b/need.o \
+       jets/b/reel.o \
+       jets/b/roll.o \
+       jets/b/skim.o \
+       jets/b/skip.o \
+       jets/b/scag.o \
+       jets/b/slag.o \
+       jets/b/snag.o \
+       jets/b/sort.o \
+       jets/b/turn.o \
+       jets/b/weld.o
 
 J_C_OFILES=\
-       j/c/bex.o \
-       j/c/can.o \
-       j/c/cap.o \
-       j/c/cat.o \
-       j/c/con.o \
-       j/c/cut.o \
-       j/c/dor.o \
-       j/c/dis.o \
-       j/c/end.o \
-       j/c/gor.o \
-       j/c/hor.o \
-       j/c/lsh.o \
-       j/c/mas.o \
-       j/c/met.o \
-       j/c/mix.o \
-       j/c/mug.o \
-       j/c/peg.o \
-       j/c/po.o  \
-       j/c/rap.o \
-       j/c/rip.o \
-       j/c/rsh.o \
-       j/c/vor.o
+       jets/c/bex.o \
+       jets/c/can.o \
+       jets/c/cap.o \
+       jets/c/cat.o \
+       jets/c/con.o \
+       jets/c/cut.o \
+       jets/c/dor.o \
+       jets/c/dis.o \
+       jets/c/end.o \
+       jets/c/gor.o \
+       jets/c/hor.o \
+       jets/c/lsh.o \
+       jets/c/mas.o \
+       jets/c/met.o \
+       jets/c/mix.o \
+       jets/c/mug.o \
+       jets/c/peg.o \
+       jets/c/po.o  \
+       jets/c/rap.o \
+       jets/c/rip.o \
+       jets/c/rsh.o \
+       jets/c/vor.o
 
 J_D_OFILES=\
-       j/d/in_has.o \
-       j/d/in_int.o \
-       j/d/in_gas.o \
-       j/d/in_mer.o \
-       j/d/in_put.o \
-       j/d/in_tap.o \
-       j/d/in_uni.o \
-       j/d/by_gas.o \
-       j/d/by_get.o \
-       j/d/by_has.o \
-       j/d/by_int.o \
-       j/d/by_put.o \
-       j/d/by_uni.o
+       jets/d/in_has.o \
+       jets/d/in_int.o \
+       jets/d/in_gas.o \
+       jets/d/in_mer.o \
+       jets/d/in_put.o \
+       jets/d/in_tap.o \
+       jets/d/in_uni.o \
+       jets/d/in_bif.o \
+       jets/d/in_dif.o \
+       jets/d/by_gas.o \
+       jets/d/by_get.o \
+       jets/d/by_has.o \
+       jets/d/by_int.o \
+       jets/d/by_put.o \
+       jets/d/by_uni.o \
+       jets/d/by_bif.o \
+       jets/d/by_dif.o
 
 J_E_OFILES=\
-       j/e/aesc.o \
-       j/e/cue.o \
-       j/e/jam.o \
-       j/e/mat.o \
-       j/e/mink.o \
-       j/e/mule.o \
-       j/e/parse.o \
-       j/e/rd.o \
-       j/e/repg.o \
-       j/e/rexp.o \
-       j/e/rub.o \
-       j/e/scr.o \
-       j/e/shax.o \
-       j/e/lore.o \
-       j/e/loss.o \
-       j/e/trip.o
+       jets/e/aesc.o \
+       jets/e/cue.o \
+       jets/e/jam.o \
+       jets/e/mat.o \
+       jets/e/mink.o \
+       jets/e/mule.o \
+       jets/e/parse.o \
+       jets/e/rd.o \
+       jets/e/repg.o \
+       jets/e/rexp.o \
+       jets/e/rub.o \
+       jets/e/scr.o \
+       jets/e/shax.o \
+       jets/e/lore.o \
+       jets/e/loss.o \
+       jets/e/trip.o
 
 J_E_OFILES_ED=\
-       j/e/ed_puck.o \
-       j/e/ed_sign.o \
-       j/e/ed_veri.o
+       jets/e/ed_puck.o \
+       jets/e/ed_sign.o \
+       jets/e/ed_veri.o
 
 J_F_OFILES=\
-       j/f/al.o \
-       j/f/ap.o \
-       j/f/bull.o \
-       j/f/cell.o \
-       j/f/comb.o \
-       j/f/cons.o \
-       j/f/core.o \
-       j/f/cube.o \
-       j/f/face.o \
-       j/f/fitz.o \
-       j/f/flan.o \
-       j/f/flay.o \
-       j/f/flip.o \
-       j/f/flor.o \
-       j/f/fork.o \
-       j/f/hike.o \
-       j/f/look.o \
+       jets/f/al.o \
+       jets/f/ap.o \
+       jets/f/bull.o \
+       jets/f/cell.o \
+       jets/f/comb.o \
+       jets/f/cons.o \
+       jets/f/core.o \
+       jets/f/cube.o \
+       jets/f/face.o \
+       jets/f/fitz.o \
+       jets/f/flan.o \
+       jets/f/flay.o \
+       jets/f/flip.o \
+       jets/f/flor.o \
+       jets/f/fork.o \
+       jets/f/hike.o \
+       jets/f/look.o \
 
 J_F_OFILES_UT=\
-       j/f/ut.o \
-       j/f/ut_burn.o \
-       j/f/ut_busk.o \
-       j/f/ut_bust.o \
-       j/f/ut_conk.o \
-       j/f/ut_crop.o \
-       j/f/ut_cull.o \
-       j/f/ut_find.o \
-       j/f/ut_fink.o \
-       j/f/ut_fire.o \
-       j/f/ut_firm.o \
-       j/f/ut_fish.o \
-       j/f/ut_fuse.o \
-       j/f/ut_gain.o \
-       j/f/ut_heal.o \
-       j/f/ut_lose.o \
-       j/f/ut_mint.o \
-       j/f/ut_mull.o \
-       j/f/ut_nest.o \
-       j/f/ut_park.o \
-       j/f/ut_peek.o \
-       j/f/ut_play.o \
-       j/f/ut_repo.o \
-       j/f/ut_rest.o \
-       j/f/ut_seek.o \
-       j/f/ut_swab.o \
-       j/f/ut_tack.o \
-       j/f/ut_tock.o \
-       j/f/ut_wrap.o
+       jets/f/ut.o \
+       jets/f/ut_burn.o \
+       jets/f/ut_busk.o \
+       jets/f/ut_bust.o \
+       jets/f/ut_conk.o \
+       jets/f/ut_crop.o \
+       jets/f/ut_cull.o \
+       jets/f/ut_find.o \
+       jets/f/ut_fink.o \
+       jets/f/ut_fire.o \
+       jets/f/ut_firm.o \
+       jets/f/ut_fish.o \
+       jets/f/ut_fuse.o \
+       jets/f/ut_gain.o \
+       jets/f/ut_heal.o \
+       jets/f/ut_lose.o \
+       jets/f/ut_mint.o \
+       jets/f/ut_mull.o \
+       jets/f/ut_nest.o \
+       jets/f/ut_park.o \
+       jets/f/ut_peek.o \
+       jets/f/ut_play.o \
+       jets/f/ut_repo.o \
+       jets/f/ut_rest.o \
+       jets/f/ut_seek.o \
+       jets/f/ut_swab.o \
+       jets/f/ut_tack.o \
+       jets/f/ut_tock.o \
+       jets/f/ut_wrap.o
 
 J_G_OFILES=\
-       j/g/down.o
+       jets/g/down.o
 
 J_OFILES=\
        $(J_A_OFILES) \
@@ -283,7 +287,7 @@ J_OFILES=\
        $(J_F_OFILES) \
        $(J_F_OFILES_UT) \
        $(J_G_OFILES) \
-       j/tree.o
+       jets/tree.o
 
 BASE_OFILES=$(N_OFILES) $(J_OFILES)
 
@@ -294,25 +298,25 @@ OUT_OFILES=\
        outside/jhttp/http_parser.o
 
 V_OFILES=\
-       v/ames.o \
-       v/cttp.o \
-       v/http.o \
-       v/loop.o \
-       v/raft.o \
-       v/reck.o \
-       v/sist.o \
-       v/temp.o \
-       v/term.o \
-       v/time.o \
-       v/unix.o \
-       v/save.o \
-       v/walk.o
+       vere/ames.o \
+       vere/behn.o \
+       vere/cttp.o \
+       vere/http.o \
+       vere/loop.o \
+       vere/raft.o \
+       vere/reck.o \
+       vere/sist.o \
+       vere/term.o \
+       vere/time.o \
+       vere/unix.o \
+       vere/save.o \
+       vere/walk.o
 
 MAIN_FILE =\
-       v/main.o
+       vere/main.o
 
 MEME_FILE =\
-       w/test.o
+       tests/test.o
 
 VERE_OFILES=\
        $(CRE2_OFILES) \
@@ -411,7 +415,7 @@ $(LIBSCRYPT):
 $(CRE2_OFILES): outside/cre2/src/src/cre2.cpp outside/cre2/src/src/cre2.h $(LIBRE2)
 	$(CXX) $(CXXFLAGS) -c $< -o $@
 
-$(V_OFILES): i/v/vere.h
+$(V_OFILES): include/vere/vere.h
 
 ifdef NO_SILENT_RULES
 $(BIN)/urbit: $(LIBCRE) $(LIBCOMMONMARK) $(VERE_OFILES) $(LIBUV) $(LIBRE2) $(LIBED25519) $(LIBANACHRONISM) $(LIBSCRYPT)
diff --git a/i/all.h b/i/all.h
deleted file mode 100644
index 61296892a..000000000
--- a/i/all.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* include/all.h
-**
-** This file is in the public domain.
-*/
-  /** c3: C environment.
-  **/
-#   include "c/portable.h"  //  C and OS portability
-#   include "c/types.h"     //  c3 types
-#   include "c/defs.h"      //  c3 macros
-#   include "c/motes.h"     //  c3 constants
-
-  /** u3: noun environment.
-  **/
-#   include "n/u.h"         //  general u3 
-
-#   include "n/a.h"         //  u3a: allocation
-#   include "n/e.h"         //  u3e: persistence
-#   include "n/h.h"         //  u3h: hashtables
-#   include "n/i.h"         //  u3i: noun construction
-#   include "n/j.h"         //  u3j: jet control
-#   include "n/m.h"         //  u3m: master state
-#   include "n/n.h"         //  u3n: nock execution
-#   include "n/o.h"         //  u3o: config options
-#   include "n/r.h"         //  u3r: noun access (error returns)
-#   include "n/t.h"         //  u3t: profiling / tracing
-#   include "n/x.h"         //  u3x: noun access (error crashes) 
-#   include "n/v.h"         //  u3v: arvo kernel
-#   include "n/z.h"         //  u3z: memoization
-
-#   include "j/k.h"         //  u3k: jets (transfer, args)
-#   include "j/q.h"         //  u3q: jets (retain, args)
-#   include "j/w.h"         //  u3w: jets (retain, core)
diff --git a/include/all.h b/include/all.h
new file mode 100644
index 000000000..a84700d0d
--- /dev/null
+++ b/include/all.h
@@ -0,0 +1,32 @@
+/* include/all.h
+**
+** This file is in the public domain.
+*/
+  /** c3: C environment.
+  **/
+#   include "c/portable.h"  //  C and OS portability
+#   include "c/types.h"     //  c3 types
+#   include "c/defs.h"      //  c3 macros
+#   include "c/motes.h"     //  c3 constants
+
+  /** u3: noun environment.
+  **/
+#   include "noun/aliases.h"   //  general u3 
+
+#   include "noun/allocate.h"  //  u3a: allocation
+#   include "noun/events.h"    //  u3e: persistence
+#   include "noun/hashtable.h" //  u3h: hashtables
+#   include "noun/imprison.h"  //  u3i: noun construction
+#   include "noun/jets.h"      //  u3j: jet control
+#   include "noun/manage.h"    //  u3m: master state
+#   include "noun/nock.h"      //  u3n: nock execution
+#   include "noun/options.h"   //  u3o: config options
+#   include "noun/retrieve.h"  //  u3r: noun access (error returns)
+#   include "noun/trace.h"     //  u3t: profiling / tracing
+#   include "noun/xtract.h"    //  u3x: noun access (error crashes) 
+#   include "noun/vortex.h"    //  u3v: arvo kernel
+#   include "noun/zave.h"      //  u3z: memoization
+
+#   include "jets/k.h"         //  u3k: jets (transfer, args)
+#   include "jets/q.h"         //  u3q: jets (retain, args)
+#   include "jets/w.h"         //  u3w: jets (retain, core)
diff --git a/i/c/defs.h b/include/c/defs.h
similarity index 100%
rename from i/c/defs.h
rename to include/c/defs.h
diff --git a/i/c/motes.h b/include/c/motes.h
similarity index 99%
rename from i/c/motes.h
rename to include/c/motes.h
index fdda1e459..3147f2270 100644
--- a/i/c/motes.h
+++ b/include/c/motes.h
@@ -1019,7 +1019,6 @@
 #   define c3__teal   c3_s4('t','e','a','l')
 #   define c3__teck   c3_s4('t','e','c','k')
 #   define c3__tell   c3_s4('t','e','l','l')
-#   define c3__temp   c3_s4('t','e','m','p')
 #   define c3__terg   c3_s4('t','e','r','g')
 #   define c3__term   c3_s4('t','e','r','m')
 #   define c3__test   c3_s4('t','e','s','t')
diff --git a/i/c/portable.h b/include/c/portable.h
similarity index 100%
rename from i/c/portable.h
rename to include/c/portable.h
diff --git a/i/c/types.h b/include/c/types.h
similarity index 100%
rename from i/c/types.h
rename to include/c/types.h
diff --git a/i/j/k.h b/include/jets/k.h
similarity index 100%
rename from i/j/k.h
rename to include/jets/k.h
diff --git a/i/j/q.h b/include/jets/q.h
similarity index 97%
rename from i/j/q.h
rename to include/jets/q.h
index 04a636295..876254aa9 100644
--- a/i/j/q.h
+++ b/include/jets/q.h
@@ -62,6 +62,8 @@
 
   /** Tier 4.
   **/
+    u3_noun u3qdb_bif(u3_noun, u3_noun);
+    u3_noun u3qdb_dif(u3_noun, u3_noun);
     u3_noun u3qdb_gas(u3_noun, u3_noun);
     u3_noun u3qdb_get(u3_noun, u3_noun);
     u3_noun u3qdb_has(u3_noun, u3_noun);
@@ -70,6 +72,8 @@
 #   define u3qdb_tap u3qdi_tap
     u3_noun u3qdb_uni(u3_noun, u3_noun);
 
+    u3_noun u3qdi_bif(u3_noun, u3_noun);
+    u3_noun u3qdi_dif(u3_noun, u3_noun);
     u3_noun u3qdi_gas(u3_noun, u3_noun);
     u3_noun u3qdi_has(u3_noun, u3_noun);
     u3_noun u3qdi_int(u3_noun, u3_noun);
diff --git a/i/j/w.h b/include/jets/w.h
similarity index 97%
rename from i/j/w.h
rename to include/jets/w.h
index c63327c5f..f917dbf33 100644
--- a/i/j/w.h
+++ b/include/jets/w.h
@@ -67,6 +67,8 @@
 
   /** Tier 4.
   **/
+    u3_noun u3wdb_bif(u3_noun);
+    u3_noun u3wdb_dif(u3_noun);
     u3_noun u3wdb_gas(u3_noun);
     u3_noun u3wdb_get(u3_noun);
     u3_noun u3wdb_has(u3_noun);
@@ -75,6 +77,8 @@
 #   define u3wdb_tap u3wdi_tap
     u3_noun u3wdb_uni(u3_noun);
 
+    u3_noun u3wdi_bif(u3_noun);
+    u3_noun u3wdi_dif(u3_noun);
     u3_noun u3wdi_gas(u3_noun);
     u3_noun u3wdi_has(u3_noun);
     u3_noun u3wdi_int(u3_noun);
diff --git a/i/n/u.h b/include/noun/aliases.h
similarity index 100%
rename from i/n/u.h
rename to include/noun/aliases.h
diff --git a/i/n/a.h b/include/noun/allocate.h
similarity index 100%
rename from i/n/a.h
rename to include/noun/allocate.h
diff --git a/i/n/e.h b/include/noun/events.h
similarity index 100%
rename from i/n/e.h
rename to include/noun/events.h
diff --git a/i/n/h.h b/include/noun/hashtable.h
similarity index 100%
rename from i/n/h.h
rename to include/noun/hashtable.h
diff --git a/i/n/i.h b/include/noun/imprison.h
similarity index 100%
rename from i/n/i.h
rename to include/noun/imprison.h
diff --git a/i/n/j.h b/include/noun/jets.h
similarity index 100%
rename from i/n/j.h
rename to include/noun/jets.h
diff --git a/i/n/m.h b/include/noun/manage.h
similarity index 100%
rename from i/n/m.h
rename to include/noun/manage.h
diff --git a/i/n/n.h b/include/noun/nock.h
similarity index 100%
rename from i/n/n.h
rename to include/noun/nock.h
diff --git a/i/n/o.h b/include/noun/options.h
similarity index 100%
rename from i/n/o.h
rename to include/noun/options.h
diff --git a/i/n/r.h b/include/noun/retrieve.h
similarity index 100%
rename from i/n/r.h
rename to include/noun/retrieve.h
diff --git a/i/n/t.h b/include/noun/trace.h
similarity index 100%
rename from i/n/t.h
rename to include/noun/trace.h
diff --git a/i/n/v.h b/include/noun/vortex.h
similarity index 100%
rename from i/n/v.h
rename to include/noun/vortex.h
diff --git a/i/n/x.h b/include/noun/xtract.h
similarity index 100%
rename from i/n/x.h
rename to include/noun/xtract.h
diff --git a/i/n/z.h b/include/noun/zave.h
similarity index 100%
rename from i/n/z.h
rename to include/noun/zave.h
diff --git a/i/v/vere.h b/include/vere/vere.h
similarity index 98%
rename from i/v/vere.h
rename to include/vere/vere.h
index 4e7a86c90..0160640a9 100644
--- a/i/v/vere.h
+++ b/include/vere/vere.h
@@ -369,13 +369,13 @@
 #endif
       } u3_unix;
 
-    /* u3_temp: just a timer for ever
+    /* u3_behn: just a timer for ever
     */
-      typedef struct _u3_temp {
-        uv_timer_t tim_u;                   //  temp timer
+      typedef struct _u3_behn {
+        uv_timer_t tim_u;                   //  behn timer
         c3_w       run_w;                   //  run of consecutive alarms
         c3_o       alm;                     //  alarm
-      } u3_temp;
+      } u3_behn;
 
     /* u2_utfo: unix terminfo strings.
     */
@@ -558,7 +558,7 @@
         u3_save    sav_u;                   //  autosave
         u3_opts    ops_u;                   //  commandline options
         u3_unix    unx_u;                   //  sync and clay
-        u3_temp    teh_u;                   //  temp timer
+        u3_behn    teh_u;                   //  behn timer
         c3_o       liv;                     //  if u3_no, shut down
         c3_i       xit_i;                   //  exit code for shutdown
         void*      ssl_u;                   //  struct SSL_CTX*
@@ -976,22 +976,22 @@
         u3_unix_io_poll(void);
 
 
-    /**  Temp, just a timer.
+    /**  behn, just a timer.
     **/
-      /* u2_temp_io_init(): initialize temp timer.
+      /* u2_behn_io_init(): initialize behn timer.
       */
         void
-        u2_temp_io_init(void);
+        u2_behn_io_init(void);
 
-      /* u2_temp_io_exit(): terminate timer.
+      /* u2_behn_io_exit(): terminate timer.
       */
         void
-        u2_temp_io_exit(void);
+        u2_behn_io_exit(void);
 
-      /* u2_temp_io_poll(): update temp IO state.
+      /* u2_behn_io_poll(): update behn IO state.
       */
         void
-        u2_temp_io_poll(void);
+        u2_behn_io_poll(void);
 
 
     /**  HTTP server.
@@ -1125,20 +1125,20 @@
 
     /**  New timer system.
     **/
-      /* u3_temp_io_init(): initialize time timer.
+      /* u3_behn_io_init(): initialize time timer.
       */
         void
-        u3_temp_io_init(void);
+        u3_behn_io_init(void);
 
-      /* u3_temp_io_exit(): terminate timer.
+      /* u3_behn_io_exit(): terminate timer.
       */
         void
-        u3_temp_io_exit(void);
+        u3_behn_io_exit(void);
 
-      /* u3_temp_io_poll(): update temp IO state.
+      /* u3_behn_io_poll(): update behn IO state.
       */
         void
-        u3_temp_io_poll(void);
+        u3_behn_io_poll(void);
 
 
     /**  HTTP client.
diff --git a/j/a/add.c b/jets/a/add.c
similarity index 100%
rename from j/a/add.c
rename to jets/a/add.c
diff --git a/j/a/dec.c b/jets/a/dec.c
similarity index 100%
rename from j/a/dec.c
rename to jets/a/dec.c
diff --git a/j/a/div.c b/jets/a/div.c
similarity index 100%
rename from j/a/div.c
rename to jets/a/div.c
diff --git a/j/a/gte.c b/jets/a/gte.c
similarity index 100%
rename from j/a/gte.c
rename to jets/a/gte.c
diff --git a/j/a/gth.c b/jets/a/gth.c
similarity index 100%
rename from j/a/gth.c
rename to jets/a/gth.c
diff --git a/j/a/lte.c b/jets/a/lte.c
similarity index 100%
rename from j/a/lte.c
rename to jets/a/lte.c
diff --git a/j/a/lth.c b/jets/a/lth.c
similarity index 100%
rename from j/a/lth.c
rename to jets/a/lth.c
diff --git a/j/a/mod.c b/jets/a/mod.c
similarity index 100%
rename from j/a/mod.c
rename to jets/a/mod.c
diff --git a/j/a/mul.c b/jets/a/mul.c
similarity index 100%
rename from j/a/mul.c
rename to jets/a/mul.c
diff --git a/j/a/sub.c b/jets/a/sub.c
similarity index 100%
rename from j/a/sub.c
rename to jets/a/sub.c
diff --git a/j/b/bind.c b/jets/b/bind.c
similarity index 100%
rename from j/b/bind.c
rename to jets/b/bind.c
diff --git a/j/b/clap.c b/jets/b/clap.c
similarity index 100%
rename from j/b/clap.c
rename to jets/b/clap.c
diff --git a/j/b/drop.c b/jets/b/drop.c
similarity index 100%
rename from j/b/drop.c
rename to jets/b/drop.c
diff --git a/j/b/flop.c b/jets/b/flop.c
similarity index 100%
rename from j/b/flop.c
rename to jets/b/flop.c
diff --git a/j/b/lent.c b/jets/b/lent.c
similarity index 100%
rename from j/b/lent.c
rename to jets/b/lent.c
diff --git a/j/b/levy.c b/jets/b/levy.c
similarity index 100%
rename from j/b/levy.c
rename to jets/b/levy.c
diff --git a/j/b/lien.c b/jets/b/lien.c
similarity index 100%
rename from j/b/lien.c
rename to jets/b/lien.c
diff --git a/j/b/need.c b/jets/b/need.c
similarity index 100%
rename from j/b/need.c
rename to jets/b/need.c
diff --git a/j/b/reel.c b/jets/b/reel.c
similarity index 100%
rename from j/b/reel.c
rename to jets/b/reel.c
diff --git a/j/b/roll.c b/jets/b/roll.c
similarity index 100%
rename from j/b/roll.c
rename to jets/b/roll.c
diff --git a/j/b/scag.c b/jets/b/scag.c
similarity index 100%
rename from j/b/scag.c
rename to jets/b/scag.c
diff --git a/j/b/skim.c b/jets/b/skim.c
similarity index 100%
rename from j/b/skim.c
rename to jets/b/skim.c
diff --git a/j/b/skip.c b/jets/b/skip.c
similarity index 100%
rename from j/b/skip.c
rename to jets/b/skip.c
diff --git a/j/b/slag.c b/jets/b/slag.c
similarity index 100%
rename from j/b/slag.c
rename to jets/b/slag.c
diff --git a/j/b/snag.c b/jets/b/snag.c
similarity index 100%
rename from j/b/snag.c
rename to jets/b/snag.c
diff --git a/j/b/sort.c b/jets/b/sort.c
similarity index 100%
rename from j/b/sort.c
rename to jets/b/sort.c
diff --git a/j/b/turn.c b/jets/b/turn.c
similarity index 100%
rename from j/b/turn.c
rename to jets/b/turn.c
diff --git a/j/b/weld.c b/jets/b/weld.c
similarity index 100%
rename from j/b/weld.c
rename to jets/b/weld.c
diff --git a/j/c/bex.c b/jets/c/bex.c
similarity index 100%
rename from j/c/bex.c
rename to jets/c/bex.c
diff --git a/j/c/can.c b/jets/c/can.c
similarity index 100%
rename from j/c/can.c
rename to jets/c/can.c
diff --git a/j/c/cap.c b/jets/c/cap.c
similarity index 100%
rename from j/c/cap.c
rename to jets/c/cap.c
diff --git a/j/c/cat.c b/jets/c/cat.c
similarity index 100%
rename from j/c/cat.c
rename to jets/c/cat.c
diff --git a/j/c/con.c b/jets/c/con.c
similarity index 100%
rename from j/c/con.c
rename to jets/c/con.c
diff --git a/j/c/cut.c b/jets/c/cut.c
similarity index 100%
rename from j/c/cut.c
rename to jets/c/cut.c
diff --git a/j/c/dis.c b/jets/c/dis.c
similarity index 100%
rename from j/c/dis.c
rename to jets/c/dis.c
diff --git a/j/c/dor.c b/jets/c/dor.c
similarity index 100%
rename from j/c/dor.c
rename to jets/c/dor.c
diff --git a/j/c/end.c b/jets/c/end.c
similarity index 100%
rename from j/c/end.c
rename to jets/c/end.c
diff --git a/j/c/gor.c b/jets/c/gor.c
similarity index 100%
rename from j/c/gor.c
rename to jets/c/gor.c
diff --git a/j/c/hor.c b/jets/c/hor.c
similarity index 100%
rename from j/c/hor.c
rename to jets/c/hor.c
diff --git a/j/c/lsh.c b/jets/c/lsh.c
similarity index 100%
rename from j/c/lsh.c
rename to jets/c/lsh.c
diff --git a/j/c/mas.c b/jets/c/mas.c
similarity index 100%
rename from j/c/mas.c
rename to jets/c/mas.c
diff --git a/j/c/met.c b/jets/c/met.c
similarity index 100%
rename from j/c/met.c
rename to jets/c/met.c
diff --git a/j/c/mix.c b/jets/c/mix.c
similarity index 100%
rename from j/c/mix.c
rename to jets/c/mix.c
diff --git a/j/c/mug.c b/jets/c/mug.c
similarity index 100%
rename from j/c/mug.c
rename to jets/c/mug.c
diff --git a/j/c/peg.c b/jets/c/peg.c
similarity index 100%
rename from j/c/peg.c
rename to jets/c/peg.c
diff --git a/j/c/po.c b/jets/c/po.c
similarity index 100%
rename from j/c/po.c
rename to jets/c/po.c
diff --git a/j/c/rap.c b/jets/c/rap.c
similarity index 100%
rename from j/c/rap.c
rename to jets/c/rap.c
diff --git a/j/c/rip.c b/jets/c/rip.c
similarity index 100%
rename from j/c/rip.c
rename to jets/c/rip.c
diff --git a/j/c/rsh.c b/jets/c/rsh.c
similarity index 100%
rename from j/c/rsh.c
rename to jets/c/rsh.c
diff --git a/j/c/vor.c b/jets/c/vor.c
similarity index 100%
rename from j/c/vor.c
rename to jets/c/vor.c
diff --git a/jets/d/by_bif.c b/jets/d/by_bif.c
new file mode 100644
index 000000000..f61f8379b
--- /dev/null
+++ b/jets/d/by_bif.c
@@ -0,0 +1,79 @@
+/* jets/d/by_bif.c
+**
+*/
+#include "all.h"
+
+/* internal functions
+*/
+  u3_noun _b_bif_putroot(u3_noun a, u3_noun b)
+  {
+    if ( u3_nul == a) {
+      return u3nt(u3k(b), u3_nul, u3_nul);
+    }
+    else {
+      u3_noun n_a, l_a, r_a;
+      u3_noun p_n_a, q_n_a;
+      u3_noun p_b, q_b;
+
+      if (    (c3n == u3r_trel(a, &n_a, &l_a, &r_a))
+           || (c3n == u3r_cell(b, &p_b, &q_b))
+           || (c3n == u3r_cell(n_a, &p_n_a, &q_n_a)) ) {
+        return u3m_bail(c3__exit);
+      }
+      else if ( c3y == u3r_sing(p_b, p_n_a) ) {
+        return u3nt(u3k(b), u3k(l_a), u3k(r_a));
+      }
+      else {
+        u3_noun c, n_c, l_c, r_c;
+        u3_noun d;
+
+        if ( c3y == u3qc_gor(p_b, p_n_a) ) {
+          c = _b_bif_putroot(l_a, b);
+          u3r_trel(c, &n_c, &l_c, &r_c);
+          d = u3nt(u3k(n_c),
+                   u3k(l_c),
+                   u3nt(u3k(n_a), u3k(r_c), u3k(r_a))
+                  );
+          u3z(c);
+          return d;
+        } else {
+          c = _b_bif_putroot(r_a, b);
+          u3r_trel(c, &n_c, &l_c, &r_c);
+          d = u3nt(u3k(n_c), 
+                   u3nt(u3k(n_a), u3k(l_a), u3k(l_c)),
+                   u3k(r_c)
+                  );
+          u3z(c);
+          return d;
+        }
+      }
+    }
+  }
+
+/* functions
+*/
+  u3_noun u3wdb_bif(u3_noun cor)
+  {
+    u3_noun a, b;
+    if ( c3n == u3r_mean(cor, u3x_sam, &b, u3x_con_sam, &a, 0) ) {
+      return u3m_bail(c3__exit);
+    } else {
+      return u3qdb_bif(a, b);
+    }
+  }
+
+  u3_noun u3qdb_bif(u3_noun a, u3_noun b)
+  {
+    u3_noun c, n_c, l_c, r_c;
+    u3_noun d;
+
+    c = _b_bif_putroot(a, b);
+    u3r_trel(c, &n_c, &l_c, &r_c);
+    d = u3nc(u3k(l_c), u3k(r_c));
+    u3z(c);
+    return d;
+  }
+
+  /*
+  u3_weak u3kdi_bif(u3_noun a, u3_noun b);
+  */
diff --git a/jets/d/by_dif.c b/jets/d/by_dif.c
new file mode 100644
index 000000000..e6f202ab3
--- /dev/null
+++ b/jets/d/by_dif.c
@@ -0,0 +1,83 @@
+/* jets/d/by_dif.c
+**
+*/
+#include "all.h"
+
+/* internal functions
+*/
+  u3_noun _b_dif_join(u3_noun d, u3_noun e)
+  {
+    if ( u3_nul == d ) {
+      return u3k(e);
+    } else if (u3_nul == e) {
+      return u3k(d);
+    } else {
+      u3_noun n_d, l_d, r_d;
+      u3_noun n_e, l_e, r_e;
+      u3_noun p_n_d, q_n_d;
+      u3_noun p_n_e, q_n_e;
+
+      if (    c3n == u3r_trel(d, &n_d, &l_d, &r_d)
+           || c3n == u3r_trel(e, &n_e, &l_e, &r_e)
+           || c3n == u3r_cell(n_d, &p_n_d, &q_n_d)
+           || c3n == u3r_cell(n_e, &p_n_e, &q_n_e) ) {
+        return u3m_bail(c3__exit);
+      } else {
+        if ( c3y == u3qc_vor(p_n_d, p_n_e) ) {
+          return u3nt(u3k(n_d),
+                      u3k(l_d),
+                      _b_dif_join(u3k(r_d), u3k(e)));
+        } else {
+          return u3nt(u3k(n_e),
+                      _b_dif_join(u3k(d), u3k(l_e)),
+                      u3k(r_e));
+        }
+      }
+    }
+  }
+
+/* functions
+*/
+  u3_noun u3wdb_dif(u3_noun cor)
+  {
+    u3_noun a, b;
+    if ( c3n == u3r_mean(cor, u3x_sam, &b, u3x_con_sam, &a, 0) ) {
+      return u3m_bail(c3__exit);
+    } else {
+      return u3qdb_dif(a, b);
+    }
+  }
+
+  u3_noun u3qdb_dif(u3_noun a, u3_noun b)
+  {
+    if ( u3_nul == b ) {
+      return u3k(a);
+    } else {
+      u3_noun n_b, l_b, r_b;
+      u3_noun c, l_c, r_c;
+
+      if ( c3n == u3r_trel(b, &n_b, &l_b, &r_b) ) {
+        return u3m_bail(c3__exit);
+      } else {
+
+        c = u3qdb_bif(a, n_b);
+
+        if ( c3n == u3r_cell(c, &l_c, &r_c) ) {
+          return u3m_bail(c3__exit);
+        } else {
+          u3_noun d;
+          u3_noun e;
+
+          d = u3qdb_dif(l_c, l_b);
+          e = u3qdb_dif(r_c, r_b);
+          u3z(c);
+
+          return _b_dif_join(d, e);
+        }
+      }
+    }
+  }
+
+  /*
+  u3_weak u3kdb_dif(u3_noun a, u3_noun b);
+  */
diff --git a/j/d/by_gas.c b/jets/d/by_gas.c
similarity index 100%
rename from j/d/by_gas.c
rename to jets/d/by_gas.c
diff --git a/j/d/by_get.c b/jets/d/by_get.c
similarity index 100%
rename from j/d/by_get.c
rename to jets/d/by_get.c
diff --git a/j/d/by_has.c b/jets/d/by_has.c
similarity index 100%
rename from j/d/by_has.c
rename to jets/d/by_has.c
diff --git a/j/d/by_int.c b/jets/d/by_int.c
similarity index 100%
rename from j/d/by_int.c
rename to jets/d/by_int.c
diff --git a/j/d/by_put.c b/jets/d/by_put.c
similarity index 100%
rename from j/d/by_put.c
rename to jets/d/by_put.c
diff --git a/j/d/by_uni.c b/jets/d/by_uni.c
similarity index 100%
rename from j/d/by_uni.c
rename to jets/d/by_uni.c
diff --git a/jets/d/in_bif.c b/jets/d/in_bif.c
new file mode 100644
index 000000000..c1febda27
--- /dev/null
+++ b/jets/d/in_bif.c
@@ -0,0 +1,75 @@
+/* jets/d/in_bif.c
+**
+*/
+#include "all.h"
+
+/* internal functions
+*/
+  u3_noun _i_bif_putroot(u3_noun a, u3_noun b)
+  {
+    if ( u3_nul == a) {
+      return u3nt(u3k(b), u3_nul, u3_nul);
+    }
+    else {
+      u3_noun n_a, l_a, r_a;
+
+      if ( (c3n == u3r_trel(a, &n_a, &l_a, &r_a)) ) {
+        return u3m_bail(c3__exit);
+      }
+      else if ( c3y == u3r_sing(b, n_a) ) {
+        return u3k(a);
+      }
+      else {
+        u3_noun c, n_c, l_c, r_c;
+        u3_noun d;
+
+        if ( c3y == u3qc_hor(b, n_a) ) {
+          c = _i_bif_putroot(l_a, b);
+          u3r_trel(c, &n_c, &l_c, &r_c);
+          d = u3nt(u3k(n_c),
+                   u3k(l_c),
+                   u3nt(u3k(n_a), u3k(r_c), u3k(r_a))
+                  );
+          u3z(c);
+          return d;
+        } else {
+          c = _i_bif_putroot(r_a, b);
+          u3r_trel(c, &n_c, &l_c, &r_c);
+          d = u3nt(u3k(n_c), 
+                   u3nt(u3k(n_a), u3k(l_a), u3k(l_c)),
+                   u3k(r_c)
+                  );
+          u3z(c);
+          return d;
+        }
+      }
+    }
+  }
+
+/* functions
+*/
+  u3_noun u3wdi_bif(u3_noun cor)
+  {
+    u3_noun a, b;
+    if ( c3n == u3r_mean(cor, u3x_sam, &b, u3x_con_sam, &a, 0) ) {
+      return u3m_bail(c3__exit);
+    } else {
+      return u3qdi_bif(a, b);
+    }
+  }
+
+  u3_noun u3qdi_bif(u3_noun a, u3_noun b)
+  {
+    u3_noun c, n_c, l_c, r_c;
+    u3_noun d;
+
+    c = _i_bif_putroot(a, b);
+    u3r_trel(c, &n_c, &l_c, &r_c);
+    d = u3nc(u3k(l_c), u3k(r_c));
+    u3z(c);
+    return d;
+  }
+
+  /*
+  u3_weak u3kdi_bif(u3_noun a, u3_noun b);
+  */
diff --git a/jets/d/in_dif.c b/jets/d/in_dif.c
new file mode 100644
index 000000000..11aa72c23
--- /dev/null
+++ b/jets/d/in_dif.c
@@ -0,0 +1,79 @@
+/* jets/d/in_dif.c
+**
+*/
+#include "all.h"
+
+/* internal functions
+*/
+  u3_noun _i_dif_join(u3_noun d, u3_noun e)
+  {
+    if ( u3_nul == d ) {
+      return u3k(e);
+    } else if (u3_nul == e) {
+      return u3k(d);
+    } else {
+      u3_noun n_d, l_d, r_d;
+      u3_noun n_e, l_e, r_e;
+
+      if (    c3n == u3r_trel(d, &n_d, &l_d, &r_d)
+           || c3n == u3r_trel(e, &n_e, &l_e, &r_e) ) {
+        return u3m_bail(c3__exit);
+      } else {
+        if ( c3y == u3qc_vor(n_d, n_e) ) {
+          return u3nt(u3k(n_d),
+                      u3k(l_d),
+                      _i_dif_join(u3k(r_d), u3k(e)));
+        } else {
+          return u3nt(u3k(n_e),
+                      _i_dif_join(u3k(d), u3k(l_e)),
+                      u3k(r_e));
+        }
+      }
+    }
+  }
+
+/* functions
+*/
+  u3_noun u3wdi_dif(u3_noun cor)
+  {
+    u3_noun a, b;
+    if ( c3n == u3r_mean(cor, u3x_sam, &b, u3x_con_sam, &a, 0) ) {
+      return u3m_bail(c3__exit);
+    } else {
+      return u3qdi_dif(a, b);
+    }
+  }
+
+  u3_noun u3qdi_dif(u3_noun a, u3_noun b)
+  {
+    if ( u3_nul == b ) {
+      return u3k(a);
+    } else {
+      u3_noun n_b, l_b, r_b;
+      u3_noun c, l_c, r_c;
+
+      if ( c3n == u3r_trel(b, &n_b, &l_b, &r_b) ) {
+        return u3m_bail(c3__exit);
+      } else {
+
+        c = u3qdi_bif(a, n_b);
+
+        if ( c3n == u3r_cell(c, &l_c, &r_c) ) {
+          return u3m_bail(c3__exit);
+        } else {
+          u3_noun d;
+          u3_noun e;
+
+          d = u3qdi_dif(l_c, l_b);
+          e = u3qdi_dif(r_c, r_b);
+          u3z(c);
+
+          return _i_dif_join(d, e);
+        }
+      }
+    }
+  }
+
+  /*
+  u3_weak u3kdi_dif(u3_noun a, u3_noun b);
+  */
diff --git a/j/d/in_gas.c b/jets/d/in_gas.c
similarity index 100%
rename from j/d/in_gas.c
rename to jets/d/in_gas.c
diff --git a/j/d/in_has.c b/jets/d/in_has.c
similarity index 100%
rename from j/d/in_has.c
rename to jets/d/in_has.c
diff --git a/j/d/in_int.c b/jets/d/in_int.c
similarity index 100%
rename from j/d/in_int.c
rename to jets/d/in_int.c
diff --git a/j/d/in_mer.c b/jets/d/in_mer.c
similarity index 100%
rename from j/d/in_mer.c
rename to jets/d/in_mer.c
diff --git a/j/d/in_put.c b/jets/d/in_put.c
similarity index 100%
rename from j/d/in_put.c
rename to jets/d/in_put.c
diff --git a/j/d/in_tap.c b/jets/d/in_tap.c
similarity index 100%
rename from j/d/in_tap.c
rename to jets/d/in_tap.c
diff --git a/j/d/in_uni.c b/jets/d/in_uni.c
similarity index 100%
rename from j/d/in_uni.c
rename to jets/d/in_uni.c
diff --git a/j/e/aesc.c b/jets/e/aesc.c
similarity index 100%
rename from j/e/aesc.c
rename to jets/e/aesc.c
diff --git a/j/e/cue.c b/jets/e/cue.c
similarity index 100%
rename from j/e/cue.c
rename to jets/e/cue.c
diff --git a/j/e/ed_puck.c b/jets/e/ed_puck.c
similarity index 100%
rename from j/e/ed_puck.c
rename to jets/e/ed_puck.c
diff --git a/j/e/ed_sign.c b/jets/e/ed_sign.c
similarity index 100%
rename from j/e/ed_sign.c
rename to jets/e/ed_sign.c
diff --git a/j/e/ed_veri.c b/jets/e/ed_veri.c
similarity index 100%
rename from j/e/ed_veri.c
rename to jets/e/ed_veri.c
diff --git a/j/e/jam.c b/jets/e/jam.c
similarity index 100%
rename from j/e/jam.c
rename to jets/e/jam.c
diff --git a/j/e/lore.c b/jets/e/lore.c
similarity index 100%
rename from j/e/lore.c
rename to jets/e/lore.c
diff --git a/j/e/loss.c b/jets/e/loss.c
similarity index 100%
rename from j/e/loss.c
rename to jets/e/loss.c
diff --git a/j/e/mat.c b/jets/e/mat.c
similarity index 100%
rename from j/e/mat.c
rename to jets/e/mat.c
diff --git a/j/e/mink.c b/jets/e/mink.c
similarity index 100%
rename from j/e/mink.c
rename to jets/e/mink.c
diff --git a/j/e/mule.c b/jets/e/mule.c
similarity index 100%
rename from j/e/mule.c
rename to jets/e/mule.c
diff --git a/j/e/parse.c b/jets/e/parse.c
similarity index 100%
rename from j/e/parse.c
rename to jets/e/parse.c
diff --git a/j/e/rd.c b/jets/e/rd.c
similarity index 100%
rename from j/e/rd.c
rename to jets/e/rd.c
diff --git a/j/e/repg.c b/jets/e/repg.c
similarity index 100%
rename from j/e/repg.c
rename to jets/e/repg.c
diff --git a/j/e/rexp.c b/jets/e/rexp.c
similarity index 100%
rename from j/e/rexp.c
rename to jets/e/rexp.c
diff --git a/j/e/rub.c b/jets/e/rub.c
similarity index 100%
rename from j/e/rub.c
rename to jets/e/rub.c
diff --git a/j/e/scr.c b/jets/e/scr.c
similarity index 100%
rename from j/e/scr.c
rename to jets/e/scr.c
diff --git a/j/e/shax.c b/jets/e/shax.c
similarity index 100%
rename from j/e/shax.c
rename to jets/e/shax.c
diff --git a/j/e/tape.c b/jets/e/tape.c
similarity index 100%
rename from j/e/tape.c
rename to jets/e/tape.c
diff --git a/j/e/trip.c b/jets/e/trip.c
similarity index 100%
rename from j/e/trip.c
rename to jets/e/trip.c
diff --git a/j/f/al.c b/jets/f/al.c
similarity index 100%
rename from j/f/al.c
rename to jets/f/al.c
diff --git a/j/f/ap.c b/jets/f/ap.c
similarity index 100%
rename from j/f/ap.c
rename to jets/f/ap.c
diff --git a/j/f/bull.c b/jets/f/bull.c
similarity index 100%
rename from j/f/bull.c
rename to jets/f/bull.c
diff --git a/j/f/cell.c b/jets/f/cell.c
similarity index 100%
rename from j/f/cell.c
rename to jets/f/cell.c
diff --git a/j/f/comb.c b/jets/f/comb.c
similarity index 100%
rename from j/f/comb.c
rename to jets/f/comb.c
diff --git a/j/f/cons.c b/jets/f/cons.c
similarity index 100%
rename from j/f/cons.c
rename to jets/f/cons.c
diff --git a/j/f/core.c b/jets/f/core.c
similarity index 100%
rename from j/f/core.c
rename to jets/f/core.c
diff --git a/j/f/cube.c b/jets/f/cube.c
similarity index 100%
rename from j/f/cube.c
rename to jets/f/cube.c
diff --git a/j/f/face.c b/jets/f/face.c
similarity index 100%
rename from j/f/face.c
rename to jets/f/face.c
diff --git a/j/f/fine.c b/jets/f/fine.c
similarity index 100%
rename from j/f/fine.c
rename to jets/f/fine.c
diff --git a/j/f/fitz.c b/jets/f/fitz.c
similarity index 100%
rename from j/f/fitz.c
rename to jets/f/fitz.c
diff --git a/j/f/flan.c b/jets/f/flan.c
similarity index 100%
rename from j/f/flan.c
rename to jets/f/flan.c
diff --git a/j/f/flay.c b/jets/f/flay.c
similarity index 100%
rename from j/f/flay.c
rename to jets/f/flay.c
diff --git a/j/f/flip.c b/jets/f/flip.c
similarity index 100%
rename from j/f/flip.c
rename to jets/f/flip.c
diff --git a/j/f/flor.c b/jets/f/flor.c
similarity index 100%
rename from j/f/flor.c
rename to jets/f/flor.c
diff --git a/j/f/fork.c b/jets/f/fork.c
similarity index 100%
rename from j/f/fork.c
rename to jets/f/fork.c
diff --git a/j/f/hike.c b/jets/f/hike.c
similarity index 100%
rename from j/f/hike.c
rename to jets/f/hike.c
diff --git a/j/f/look.c b/jets/f/look.c
similarity index 100%
rename from j/f/look.c
rename to jets/f/look.c
diff --git a/j/f/slot.c b/jets/f/slot.c
similarity index 100%
rename from j/f/slot.c
rename to jets/f/slot.c
diff --git a/j/f/type.c b/jets/f/type.c
similarity index 100%
rename from j/f/type.c
rename to jets/f/type.c
diff --git a/j/f/ut.c b/jets/f/ut.c
similarity index 100%
rename from j/f/ut.c
rename to jets/f/ut.c
diff --git a/j/f/ut_burn.c b/jets/f/ut_burn.c
similarity index 100%
rename from j/f/ut_burn.c
rename to jets/f/ut_burn.c
diff --git a/j/f/ut_busk.c b/jets/f/ut_busk.c
similarity index 100%
rename from j/f/ut_busk.c
rename to jets/f/ut_busk.c
diff --git a/j/f/ut_bust.c b/jets/f/ut_bust.c
similarity index 100%
rename from j/f/ut_bust.c
rename to jets/f/ut_bust.c
diff --git a/j/f/ut_conk.c b/jets/f/ut_conk.c
similarity index 100%
rename from j/f/ut_conk.c
rename to jets/f/ut_conk.c
diff --git a/j/f/ut_crop.c b/jets/f/ut_crop.c
similarity index 100%
rename from j/f/ut_crop.c
rename to jets/f/ut_crop.c
diff --git a/j/f/ut_cull.c b/jets/f/ut_cull.c
similarity index 100%
rename from j/f/ut_cull.c
rename to jets/f/ut_cull.c
diff --git a/j/f/ut_find.c b/jets/f/ut_find.c
similarity index 100%
rename from j/f/ut_find.c
rename to jets/f/ut_find.c
diff --git a/j/f/ut_fink.c b/jets/f/ut_fink.c
similarity index 98%
rename from j/f/ut_fink.c
rename to jets/f/ut_fink.c
index 85577bbc6..a69008c51 100644
--- a/j/f/ut_fink.c
+++ b/jets/f/ut_fink.c
@@ -32,7 +32,7 @@
       u3_noun fin = u3t(hoq);
 
       if ( u3_nul == fin ) {
-        u3m_p("cog", cog);
+        // u3m_p("cog", cog);
         return u3m_error("find-none");
       }
       else {
diff --git a/j/f/ut_fire.c b/jets/f/ut_fire.c
similarity index 100%
rename from j/f/ut_fire.c
rename to jets/f/ut_fire.c
diff --git a/j/f/ut_firm.c b/jets/f/ut_firm.c
similarity index 100%
rename from j/f/ut_firm.c
rename to jets/f/ut_firm.c
diff --git a/j/f/ut_fish.c b/jets/f/ut_fish.c
similarity index 100%
rename from j/f/ut_fish.c
rename to jets/f/ut_fish.c
diff --git a/j/f/ut_fuse.c b/jets/f/ut_fuse.c
similarity index 100%
rename from j/f/ut_fuse.c
rename to jets/f/ut_fuse.c
diff --git a/j/f/ut_gain.c b/jets/f/ut_gain.c
similarity index 100%
rename from j/f/ut_gain.c
rename to jets/f/ut_gain.c
diff --git a/j/f/ut_heal.c b/jets/f/ut_heal.c
similarity index 100%
rename from j/f/ut_heal.c
rename to jets/f/ut_heal.c
diff --git a/j/f/ut_lose.c b/jets/f/ut_lose.c
similarity index 100%
rename from j/f/ut_lose.c
rename to jets/f/ut_lose.c
diff --git a/j/f/ut_mint.c b/jets/f/ut_mint.c
similarity index 100%
rename from j/f/ut_mint.c
rename to jets/f/ut_mint.c
diff --git a/j/f/ut_mull.c b/jets/f/ut_mull.c
similarity index 100%
rename from j/f/ut_mull.c
rename to jets/f/ut_mull.c
diff --git a/j/f/ut_nest.c b/jets/f/ut_nest.c
similarity index 100%
rename from j/f/ut_nest.c
rename to jets/f/ut_nest.c
diff --git a/j/f/ut_park.c b/jets/f/ut_park.c
similarity index 100%
rename from j/f/ut_park.c
rename to jets/f/ut_park.c
diff --git a/j/f/ut_peek.c b/jets/f/ut_peek.c
similarity index 100%
rename from j/f/ut_peek.c
rename to jets/f/ut_peek.c
diff --git a/j/f/ut_play.c b/jets/f/ut_play.c
similarity index 100%
rename from j/f/ut_play.c
rename to jets/f/ut_play.c
diff --git a/j/f/ut_repo.c b/jets/f/ut_repo.c
similarity index 100%
rename from j/f/ut_repo.c
rename to jets/f/ut_repo.c
diff --git a/j/f/ut_rest.c b/jets/f/ut_rest.c
similarity index 100%
rename from j/f/ut_rest.c
rename to jets/f/ut_rest.c
diff --git a/j/f/ut_seek.c b/jets/f/ut_seek.c
similarity index 100%
rename from j/f/ut_seek.c
rename to jets/f/ut_seek.c
diff --git a/j/f/ut_sift.c b/jets/f/ut_sift.c
similarity index 100%
rename from j/f/ut_sift.c
rename to jets/f/ut_sift.c
diff --git a/j/f/ut_swab.c b/jets/f/ut_swab.c
similarity index 100%
rename from j/f/ut_swab.c
rename to jets/f/ut_swab.c
diff --git a/j/f/ut_tack.c b/jets/f/ut_tack.c
similarity index 100%
rename from j/f/ut_tack.c
rename to jets/f/ut_tack.c
diff --git a/j/f/ut_tock.c b/jets/f/ut_tock.c
similarity index 100%
rename from j/f/ut_tock.c
rename to jets/f/ut_tock.c
diff --git a/j/f/ut_wrap.c b/jets/f/ut_wrap.c
similarity index 100%
rename from j/f/ut_wrap.c
rename to jets/f/ut_wrap.c
diff --git a/j/g/down.c b/jets/g/down.c
similarity index 100%
rename from j/g/down.c
rename to jets/g/down.c
diff --git a/j/tree.c b/jets/tree.c
similarity index 97%
rename from j/tree.c
rename to jets/tree.c
index 7ccfba0bd..39010b1cb 100644
--- a/j/tree.c
+++ b/jets/tree.c
@@ -67,6 +67,8 @@ static u3j_core _mood__hoon__po_d[] =
     {}
   };
 
+static u3j_harm _mood__hoon__by_bif_a[] = {{".2", u3wdb_bif, c3y}, {}};
+static u3j_harm _mood__hoon__by_dif_a[] = {{".2", u3wdb_dif, c3y}, {}};
 static u3j_harm _mood__hoon__by_gas_a[] = {{".2", u3wdb_gas, c3y}, {}};
 static u3j_harm _mood__hoon__by_get_a[] = {{".2", u3wdb_get, c3y}, {}};
 static u3j_harm _mood__hoon__by_has_a[] = {{".2", u3wdb_has, c3y}, {}};
@@ -75,7 +77,9 @@ static u3j_harm _mood__hoon__by_put_a[] = {{".2", u3wdb_put, c3y}, {}};
 static u3j_harm _mood__hoon__by_tap_a[] = {{".2", u3wdb_tap, c3y}, {}};
 // static u3j_harm _mood__hoon__by_uni_a[] = {{".2", u3wdb_uni, c3y}, {}};
 static u3j_core _mood__hoon__by_d[] =
-  { { "gas", _mood__hoon__by_gas_a },
+  { { "bif", _mood__hoon__by_bif_a },
+    { "dif", _mood__hoon__by_dif_a },
+    { "gas", _mood__hoon__by_gas_a },
     { "get", _mood__hoon__by_get_a },
     { "has", _mood__hoon__by_has_a },
     // { "int", _mood__hoon__by_int_a },
@@ -85,6 +89,8 @@ static u3j_core _mood__hoon__by_d[] =
     {}
   };
 
+static u3j_harm _mood__hoon__in_bif_a[] = {{".2", u3wdi_bif}, {}};
+static u3j_harm _mood__hoon__in_dif_a[] = {{".2", u3wdi_dif}, {}};
 static u3j_harm _mood__hoon__in_gas_a[] = {{".2", u3wdi_gas}, {}};
 static u3j_harm _mood__hoon__in_has_a[] = {{".2", u3wdi_has}, {}};
 static u3j_harm _mood__hoon__in_mer_a[] = {{".2", u3wdi_mer}, {}};
@@ -93,7 +99,9 @@ static u3j_harm _mood__hoon__in_put_a[] = {{".2", u3wdi_put}, {}};
 static u3j_harm _mood__hoon__in_tap_a[] = {{".2", u3wdi_tap}, {}};
 // static u3j_harm _mood__hoon__in_uni_a[] = {{".2", u3wdi_uni}, {}};
 static u3j_core _mood__hoon__in_d[] =
-  { { "gas", _mood__hoon__in_gas_a },
+  { { "bif", _mood__hoon__in_bif_a },
+    { "dif", _mood__hoon__in_dif_a },
+    { "gas", _mood__hoon__in_gas_a },
     { "has", _mood__hoon__in_has_a },
     { "mer", _mood__hoon__in_mer_a },
     // { "int", _mood__hoon__in_int_a },
diff --git a/n/a.c b/noun/allocate.c
similarity index 100%
rename from n/a.c
rename to noun/allocate.c
diff --git a/n/e.c b/noun/events.c
similarity index 100%
rename from n/e.c
rename to noun/events.c
diff --git a/n/h.c b/noun/hashtable.c
similarity index 100%
rename from n/h.c
rename to noun/hashtable.c
diff --git a/n/i.c b/noun/imprison.c
similarity index 100%
rename from n/i.c
rename to noun/imprison.c
diff --git a/n/j.c b/noun/jets.c
similarity index 100%
rename from n/j.c
rename to noun/jets.c
diff --git a/n/m.c b/noun/manage.c
similarity index 100%
rename from n/m.c
rename to noun/manage.c
diff --git a/n/n.c b/noun/nock.c
similarity index 99%
rename from n/n.c
rename to noun/nock.c
index a41c7634e..0d2b1ff4e 100644
--- a/n/n.c
+++ b/noun/nock.c
@@ -88,7 +88,7 @@ _n_hint(u3_noun zep,
         }
         pro = _n_nock_on(u3k(bus), u3k(nex));
 
-        if ( u3R != &(u3H->rod_u) ) {
+        if ( &(u3H->rod_u) != u3R ) {
           u3z_save_2(c3__nock, bus, nex, pro);
         }
 
diff --git a/n/r.c b/noun/retrieve.c
similarity index 100%
rename from n/r.c
rename to noun/retrieve.c
diff --git a/n/t.c b/noun/trace.c
similarity index 100%
rename from n/t.c
rename to noun/trace.c
diff --git a/n/v.c b/noun/vortex.c
similarity index 100%
rename from n/v.c
rename to noun/vortex.c
diff --git a/n/x.c b/noun/xtract.c
similarity index 100%
rename from n/x.c
rename to noun/xtract.c
diff --git a/n/z.c b/noun/zave.c
similarity index 100%
rename from n/z.c
rename to noun/zave.c
diff --git a/w/kjet.c b/tests/kjet.c
similarity index 100%
rename from w/kjet.c
rename to tests/kjet.c
diff --git a/w/test.c b/tests/test.c
similarity index 100%
rename from w/test.c
rename to tests/test.c
diff --git a/v/ames.c b/vere/ames.c
similarity index 99%
rename from v/ames.c
rename to vere/ames.c
index b48c1d5d2..21ab4c32f 100644
--- a/v/ames.c
+++ b/vere/ames.c
@@ -20,7 +20,7 @@
 #include <term.h>
 
 #include "all.h"
-#include "v/vere.h"
+#include "vere/vere.h"
 
 /* _ames_alloc(): libuv buffer allocator.
 */
diff --git a/v/batz.c b/vere/batz.c
similarity index 98%
rename from v/batz.c
rename to vere/batz.c
index ef5c90bc6..4ec6e6a86 100644
--- a/v/batz.c
+++ b/vere/batz.c
@@ -19,7 +19,7 @@
 #include <errno.h>
 
 #include "all.h"
-#include "v/vere.h"
+#include "vere/vere.h"
 
 /* u3_batz_io_init(): initialize batz timer.
 */
diff --git a/v/temp.c b/vere/behn.c
similarity index 67%
rename from v/temp.c
rename to vere/behn.c
index 3a7d19125..04d1989a2 100644
--- a/v/temp.c
+++ b/vere/behn.c
@@ -1,4 +1,4 @@
-/* v/temp.c
+/* v/behn.c
 **
 **  This file is in the public domain.
 */
@@ -19,32 +19,32 @@
 #include <errno.h>
 
 #include "all.h"
-#include "v/vere.h"
+#include "vere/vere.h"
 
-/* u3_temp(): initialize time timer.
+/* u3_behn(): initialize time timer.
 */
 void
-u3_temp_io_init(void)
+u3_behn_io_init(void)
 {
-  u3_temp* teh_u = &u3_Host.teh_u;
+  u3_behn* teh_u = &u3_Host.teh_u;
 
   uv_timer_init(u3L, &teh_u->tim_u);
   teh_u->alm = c3n;
 }
 
-/* u3_temp_io_exit(): terminate timer.
+/* u3_behn_io_exit(): terminate timer.
 */
 void
-u3_temp_io_exit(void)
+u3_behn_io_exit(void)
 {
 }
 
-/* _temp_time_cb(): timer callback.
+/* _behn_time_cb(): timer callback.
 */
 static void
-_temp_time_cb(uv_timer_t* tim_u)
+_behn_time_cb(uv_timer_t* tim_u)
 {
-  u3_temp* teh_u = &u3_Host.teh_u;
+  u3_behn* teh_u = &u3_Host.teh_u;
   if(teh_u->run_w < 1024) {
     teh_u->run_w++;
   }
@@ -52,19 +52,19 @@ _temp_time_cb(uv_timer_t* tim_u)
   u3_lo_open();
   {
     u3v_plan
-      (u3nt(u3_blip, c3__temp, u3_nul),
+      (u3nt(u3_blip, c3__behn, u3_nul),
        u3nc(c3__wake, u3_nul));
   }
   u3_lo_shut(c3n);
 }
 
-/* u3_temp_io_poll(): update temp IO state.
+/* u3_behn_io_poll(): update behn IO state.
 */
 void
-u3_temp_io_poll(void)
+u3_behn_io_poll(void)
 {
-  u3_temp* teh_u = &u3_Host.teh_u;
-  u3_noun  wen   = u3v_keep(u3nt(u3_blip, c3__temp, u3_nul));
+  u3_behn* teh_u = &u3_Host.teh_u;
+  u3_noun  wen   = u3v_keep(u3nt(u3_blip, c3__behn, u3_nul));
 
   if ( (u3_nul != wen) &&
        (c3y == u3du(wen)) &&
@@ -83,7 +83,7 @@ u3_temp_io_poll(void)
     }
     else teh_u->alm = c3y;
 
-    uv_timer_start(&teh_u->tim_u, _temp_time_cb, gap_d, 0);
+    uv_timer_start(&teh_u->tim_u, _behn_time_cb, gap_d, 0);
   }
   else {
     if ( c3y == teh_u->alm ) {
diff --git a/v/cttp.c b/vere/cttp.c
similarity index 99%
rename from v/cttp.c
rename to vere/cttp.c
index 02b21f004..d29ceaa94 100644
--- a/v/cttp.c
+++ b/vere/cttp.c
@@ -24,7 +24,7 @@
 
 #include "../outside/jhttp/http_parser.h"   // Joyent HTTP
 #include "all.h"
-#include "v/vere.h"
+#include "vere/vere.h"
 
 #ifdef U3_OS_osx
 #  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
diff --git a/v/http.c b/vere/http.c
similarity index 99%
rename from v/http.c
rename to vere/http.c
index 95f2b7985..340f3b5ac 100644
--- a/v/http.c
+++ b/vere/http.c
@@ -20,7 +20,7 @@
 
 #include "../outside/jhttp/http_parser.h"   // Joyent HTTP
 #include "all.h"
-#include "v/vere.h"
+#include "vere/vere.h"
 
 static void _http_request(u3_hreq* req_u);
 static void _http_request_dead(u3_hreq* req_u);
diff --git a/v/loop.c b/vere/loop.c
similarity index 98%
rename from v/loop.c
rename to vere/loop.c
index 4b35dddc1..11f4ca394 100644
--- a/v/loop.c
+++ b/vere/loop.c
@@ -21,7 +21,7 @@
 #include <term.h>
 
 #include "all.h"
-#include "v/vere.h"
+#include "vere/vere.h"
 
 #if 0
 static jmp_buf Signal_buf;
@@ -192,8 +192,8 @@ _lo_init()
   u3_save_io_init();
   u3a_lop(cod_l);
 
-  cod_l = u3a_lush(c3__temp);
-  u3_temp_io_init();
+  cod_l = u3a_lush(c3__behn);
+  u3_behn_io_init();
   u3a_lop(cod_l);
 }
 
@@ -252,8 +252,8 @@ u3_lo_exit(void)
   u3_save_io_exit();
   u3a_lop(cod_l);
 
-  cod_l = u3a_lush(c3__temp);
-  u3_temp_io_exit();
+  cod_l = u3a_lush(c3__behn);
+  u3_behn_io_exit();
   u3a_lop(cod_l);
 }
 
@@ -284,8 +284,8 @@ _lo_poll(void)
   u3_unix_io_poll();
   u3a_lop(cod_l);
 
-  cod_l = u3a_lush(c3__temp);
-  u3_temp_io_poll();
+  cod_l = u3a_lush(c3__behn);
+  u3_behn_io_poll();
   u3a_lop(cod_l);
 }
 
@@ -299,7 +299,7 @@ _lo_how(u3_noun how)
     default: c3_assert(0); break;
 
     case c3__ames: return "ames";
-    case c3__temp: return "temp";
+    case c3__behn: return "behn";
     case c3__term: return "cons";
     case c3__htcn: return "http-conn";
     case c3__htls: return "http-lisn";
diff --git a/v/main.c b/vere/main.c
similarity index 99%
rename from v/main.c
rename to vere/main.c
index e2deb7eb2..f911ad05a 100644
--- a/v/main.c
+++ b/vere/main.c
@@ -21,7 +21,7 @@
 #define U3_GLOBAL
 #define C3_GLOBAL
 #include "all.h"
-#include "v/vere.h"
+#include "vere/vere.h"
 
 /* _main_readw(): parse a word from a string.
 */
diff --git a/v/raft.c b/vere/raft.c
similarity index 99%
rename from v/raft.c
rename to vere/raft.c
index 1c6e61a58..ad91fe4aa 100644
--- a/v/raft.c
+++ b/vere/raft.c
@@ -8,7 +8,7 @@
 #include <uv.h>
 
 #include "all.h"
-#include "v/vere.h"
+#include "vere/vere.h"
 
 
 /* u3_rent: Log entry wire format.
diff --git a/v/reck.c b/vere/reck.c
similarity index 99%
rename from v/reck.c
rename to vere/reck.c
index f231e3544..70a017d21 100644
--- a/v/reck.c
+++ b/vere/reck.c
@@ -18,7 +18,7 @@
 #include <term.h>
 
 #include "all.h"
-#include "v/vere.h"
+#include "vere/vere.h"
 
 /* _reck_mole(): parse simple atomic mole.
 */
diff --git a/v/save.c b/vere/save.c
similarity index 98%
rename from v/save.c
rename to vere/save.c
index 7583d1ba9..983f8fc16 100644
--- a/v/save.c
+++ b/vere/save.c
@@ -15,7 +15,7 @@
 #include <uv.h>
 
 #include "all.h"
-#include "v/vere.h"
+#include "vere/vere.h"
 
 /* _save_time_cb(): timer callback.
 */
diff --git a/v/sist.c b/vere/sist.c
similarity index 99%
rename from v/sist.c
rename to vere/sist.c
index d813a6471..2b381a2c6 100644
--- a/v/sist.c
+++ b/vere/sist.c
@@ -10,7 +10,7 @@
 #include <uv.h>
 
 #include "all.h"
-#include "v/vere.h"
+#include "vere/vere.h"
 
 #if defined(U3_OS_linux)
 #include <stdio_ext.h>
diff --git a/v/term.c b/vere/term.c
similarity index 99%
rename from v/term.c
rename to vere/term.c
index 8cc1a9e8a..c22c8956f 100644
--- a/v/term.c
+++ b/vere/term.c
@@ -20,7 +20,7 @@
 #include <anachronism/common.h>
 #include <anachronism/nvt.h>
 #include "all.h"
-#include "v/vere.h"
+#include "vere/vere.h"
 
 static        void _term_read_tn_cb(uv_stream_t* tcp_u,
                                     ssize_t      siz_i,
diff --git a/v/time.c b/vere/time.c
similarity index 99%
rename from v/time.c
rename to vere/time.c
index 15d455b6e..8c37cbf79 100644
--- a/v/time.c
+++ b/vere/time.c
@@ -18,7 +18,7 @@
 #include <term.h>
 
 #include "all.h"
-#include "v/vere.h"
+#include "vere/vere.h"
 
 /* u3_time_sec_in(): urbit seconds from unix time.
 **
diff --git a/v/unix.c b/vere/unix.c
similarity index 99%
rename from v/unix.c
rename to vere/unix.c
index 1a3be1414..7768b500e 100644
--- a/v/unix.c
+++ b/vere/unix.c
@@ -22,7 +22,7 @@
 #include <libgen.h>
 #include <ftw.h>
 
-#include "v/vere.h"
+#include "vere/vere.h"
 
 /* _unix_down(): descend path.
 */
diff --git a/v/walk.c b/vere/walk.c
similarity index 99%
rename from v/walk.c
rename to vere/walk.c
index c432fc6c6..287c26e22 100644
--- a/v/walk.c
+++ b/vere/walk.c
@@ -19,7 +19,7 @@
 #include <errno.h>
 
 #include "all.h"
-#include "v/vere.h"
+#include "vere/vere.h"
 
   /*  |%
   **  ++  arch                                        ::  fs node