diff --git a/ape/ask.hoon b/app/ask.hoon
similarity index 98%
rename from ape/ask.hoon
rename to app/ask.hoon
index 25b98f9a9..9b34b6cba 100644
--- a/ape/ask.hoon
+++ b/app/ask.hoon
@@ -1,6 +1,6 @@
 ::  There is no love that is not an echo
 ::
-::::  /hoon/echo/ape
+::::  /hoon/ask/app
   ::
 /?    314
 /+    sole
diff --git a/ape/curl.hoon b/app/curl.hoon
similarity index 93%
rename from ape/curl.hoon
rename to app/curl.hoon
index 4978616d3..61b6c8b0d 100644
--- a/ape/curl.hoon
+++ b/app/curl.hoon
@@ -1,5 +1,5 @@
 !:
-::::
+::::  /hoon/curl/app
   ::
 |_  [[^ ^ ost=@ ^] ~]
 ++  poke  |*(a=[mark *] :_(+> [ost %hiss / %wain a]~))
diff --git a/ape/dojo.hoon b/app/dojo.hoon
similarity index 100%
rename from ape/dojo.hoon
rename to app/dojo.hoon
diff --git a/ape/hood.hoon b/app/hood.hoon
similarity index 99%
rename from ape/hood.hoon
rename to app/hood.hoon
index 9432d9d28..483177340 100644
--- a/ape/hood.hoon
+++ b/app/hood.hoon
@@ -1,5 +1,5 @@
 ::                                                      ::  ::
-::::  /hoon/hood/ape                                    ::  ::
+::::  /hoon/hood/app                                    ::  ::
   ::                                                    ::  ::
 /?  314                                                 ::  zuse version
 /+  sole, talk, helm, kiln, drum, write                 ::  libraries
diff --git a/ape/talk.hoon b/app/talk.hoon
similarity index 99%
rename from ape/talk.hoon
rename to app/talk.hoon
index 72946b620..123f38a5a 100644
--- a/ape/talk.hoon
+++ b/app/talk.hoon
@@ -2151,14 +2151,14 @@
   =+  grams:(~(got by stories) man)
   [ost.hid %info /jamfile our.hid (foal paf [%talk-telegrams !>(-)])]
 ::
-++  poke-save
+++  poke-talk-save
   |=  man=span
   ^-  (quip move +>)
   =+  paf=/(scot %p our.hid)/home/(scot %da now.hid)/talk/[man]/talk-telegrams
   =+  grams:(~(got by stories) man)
   [[ost.hid %info /jamfile our.hid (foal paf [%talk-telegrams !>(-)])]~ +>.$]
 ::
-++  poke-load
+++  poke-talk-load
   |=  man=span
   =+  ^=  grams
       %-  (hard (list telegram))
@@ -2168,15 +2168,14 @@
   =+  toy=(~(got by stories) man)
   [~ +>.$(stories (~(put by stories) man toy(grams grams, count (lent grams))))]
 ::
-++  poke-log
+++  poke-talk-log
   |=  man=span
   ~&  %poke-log
-
   ^-  (quip move +>)
   :-  [(log-to-file man) ~]
   +>.$(log (~(put by log) man count:(~(got by stories) man)))
 ::
-++  poke-unlog
+++  poke-talk-unlog
   |=  man=span
   ^-  (quip move +>)
   :-  ~
diff --git a/ape/work.hoon b/app/work.hoon
similarity index 99%
rename from ape/work.hoon
rename to app/work.hoon
index a61b16700..08cb0aa45 100644
--- a/ape/work.hoon
+++ b/app/work.hoon
@@ -1,5 +1,5 @@
 ::
-::::
+::::  /hoon/work/app
   ::
 /?  314
 /-  work
diff --git a/arvo/gall.hoon b/arvo/gall.hoon
index 7ca3683a9..8348108b4 100644
--- a/arvo/gall.hoon
+++ b/arvo/gall.hoon
@@ -210,7 +210,7 @@
     ::  ~&  [%mo-boot dap how byk]
     %+  mo-pass  [%sys how dap (scot %p p.byk) q.byk (scot r.byk) ~]
     ^-  note-arvo
-    [%f %exec our `[byk %core [byk [dap %ape ~]]]]
+    [%f %exec our `[byk %core [byk [dap %app ~]]]]
   ::
   ++  mo-away                                           ::  foreign request
     |=  [him=ship caz=cush]                             ::  
diff --git a/arvo/jael.hoon b/arvo/jael.hoon
index adc2e52b4..c6c650015 100644
--- a/arvo/jael.hoon
+++ b/arvo/jael.hoon
@@ -1,6 +1,6 @@
 ::    %jael, secret storage
 ::
-::::  /hoon/jael
+::::  /hoon/jael/arvo
   ::
 !?  164
 ::::
diff --git a/arvo/kahn.hoon b/arvo/kahn.hoon
index 962f7e8e7..aaf679798 100644
--- a/arvo/kahn.hoon
+++ b/arvo/kahn.hoon
@@ -1,6 +1,6 @@
 ::    %kahn, social state
 ::
-::::  /hoon/kahn
+::::  /hoon/kahn/arvo
   ::
 !?  164
 ::::
diff --git a/arvo/lunt.hoon b/arvo/lunt.hoon
index 023432cfc..d96bb7337 100644
--- a/arvo/lunt.hoon
+++ b/arvo/lunt.hoon
@@ -1,6 +1,6 @@
 ::    %lunt, fleet job control
 ::
-::::  /hoon/lunt
+::::  /hoon/lunt/arvo
   ::
 !?  164
 ::::
diff --git a/arvo/musk.hoon b/arvo/musk.hoon
index 03dfda150..f38358165 100644
--- a/arvo/musk.hoon
+++ b/arvo/musk.hoon
@@ -1,6 +1,6 @@
 ::    %musk, realm management
 ::
-::::  /hoon/musk
+::::  /hoon/musk/arvo
   ::
 !?  164
 ::::
diff --git a/gen/cat.hoon b/gen/cat.hoon
index b59e13c51..0953de166 100644
--- a/gen/cat.hoon
+++ b/gen/cat.hoon
@@ -1,6 +1,6 @@
 ::  ConCATenate file listings
 ::  
-::::  /hoon/gen/cat
+::::  /hoon/cat/gen
   ::
 //  /%%/ls/subdir
 //  /%/pretty
diff --git a/gen/cat/pretty.hoon b/gen/cat/pretty.hoon
index d41cf607d..2048a7590 100644
--- a/gen/cat/pretty.hoon
+++ b/gen/cat/pretty.hoon
@@ -1,3 +1,6 @@
+::
+::::  /hoon/pretty/cat/gen
+  ::
 !:
 |%
 ++  pretty-noun
diff --git a/gen/curl.hoon b/gen/curl.hoon
index 8c446c307..3d52fde73 100644
--- a/gen/curl.hoon
+++ b/gen/curl.hoon
@@ -1,3 +1,6 @@
+::
+::::  /hoon/curl/gen
+  ::
 /-  sole
 [sole]
 :-  %get  |=  [^ [a=tape ~] ~]
diff --git a/gen/curl/url.hoon b/gen/curl/url.hoon
index 5fc8ec339..b8a90d2f9 100644
--- a/gen/curl/url.hoon
+++ b/gen/curl/url.hoon
@@ -1,5 +1,5 @@
 ::
-::::
+::::  /hoon/url/curl/gen
   ::
 /?  310
 ::
diff --git a/gen/hood/ask.hoon b/gen/hood/ask.hoon
index 077adc7a6..6f9e91fec 100644
--- a/gen/hood/ask.hoon
+++ b/gen/hood/ask.hoon
@@ -1,3 +1,6 @@
+::
+::::  /hoon/ask/hood/gen
+  ::
 :-  %say
 |=  [^ [mel=cord ~] ~]
 =+  adr=(star ;~(less (mask "\"\\()[],:;<>@") prn))
diff --git a/gen/hood/begin.hoon b/gen/hood/begin.hoon
index 557289cab..9e8486f91 100644
--- a/gen/hood/begin.hoon
+++ b/gen/hood/begin.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/begin/hood/gun
+::::  /hoon/begin/hood/gen
   ::
 /?  314
 /-  sole
diff --git a/gen/hood/breload.hoon b/gen/hood/breload.hoon
index 5bf49573e..2d968dd1c 100644
--- a/gen/hood/breload.hoon
+++ b/gen/hood/breload.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/reload/hood/gen
+::::  /hoon/breload/hood/gen
   ::
 /?  314
 ::
diff --git a/gen/hood/cp.hoon b/gen/hood/cp.hoon
index a4dfce141..50ddf4a1d 100644
--- a/gen/hood/cp.hoon
+++ b/gen/hood/cp.hoon
@@ -1,2 +1,5 @@
+::
+::::  /hoon/cp/hood/gen
+  ::
 :-  %say
 |=([^ [input=path output=path ~] ~] kiln-cp/[input output])
diff --git a/gen/hood/hi.hoon b/gen/hood/hi.hoon
index fd4e96142..68672c3d2 100644
--- a/gen/hood/hi.hoon
+++ b/gen/hood/hi.hoon
@@ -1,2 +1,5 @@
+::
+::::  /hoon/hi/hood/gen
+  ::
 :-  %say
 |=([^ [who=ship mez=$|(~ [a=tape ~])] ~] helm-send-hi/[who ?~(mez ~ `a.mez)])
diff --git a/gen/hood/init.hoon b/gen/hood/init.hoon
index cf0beacc9..38ab7a322 100644
--- a/gen/hood/init.hoon
+++ b/gen/hood/init.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/reload/hood/gen
+::::  /hoon/init/hood/gen
   ::
 /?  314
 ::
diff --git a/gen/hood/mv.hoon b/gen/hood/mv.hoon
index 84ca6ad66..911e08ab4 100644
--- a/gen/hood/mv.hoon
+++ b/gen/hood/mv.hoon
@@ -1,2 +1,5 @@
+::
+::::  /hoon/mv/hood/gen
+  ::
 :-  %say
 |=([^ [input=path output=path ~] ~] kiln-mv/[input output])
diff --git a/gen/hood/rc.hoon b/gen/hood/rc.hoon
index 109d587dc..7a0470c47 100644
--- a/gen/hood/rc.hoon
+++ b/gen/hood/rc.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/reload/hood/gen
+::::  /hoon/rc/hood/gen
   ::
 /?  314
 ::
diff --git a/gen/hood/reboot.hoon b/gen/hood/reboot.hoon
index 15eb0d660..6e1afd669 100644
--- a/gen/hood/reboot.hoon
+++ b/gen/hood/reboot.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/reload/hood/gen
+::::  /hoon/reboot/hood/gen
   ::
 /?  314
 ::
diff --git a/gen/hood/reload-desk.hoon b/gen/hood/reload-desk.hoon
index bac2b4195..79d1f7c35 100644
--- a/gen/hood/reload-desk.hoon
+++ b/gen/hood/reload-desk.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/reload/hood/gen
+::::  /hoon/reload-desk/hood/gen
   ::
 /?  314
 ::
diff --git a/gen/hood/rf.hoon b/gen/hood/rf.hoon
index 0bdfef13b..fcdb55e03 100644
--- a/gen/hood/rf.hoon
+++ b/gen/hood/rf.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/reload/hood/gen
+::::  /hoon/rf/hood/gen
   ::
 /?  314
 ::
diff --git a/gen/hood/rm.hoon b/gen/hood/rm.hoon
index 7b7d3b449..ee98df7e5 100644
--- a/gen/hood/rm.hoon
+++ b/gen/hood/rm.hoon
@@ -1,2 +1,5 @@
+::
+::::  /hoon/rm/hood/gen
+  ::
 :-  %say
 |=([^ [input=path ~] ~] kiln-rm/input)
diff --git a/gen/hood/schedule.hoon b/gen/hood/schedule.hoon
index 9cc675085..12bda9442 100644
--- a/gen/hood/schedule.hoon
+++ b/gen/hood/schedule.hoon
@@ -1,2 +1,5 @@
+::
+::::  /hoon/schedule/hood/gen
+  ::
 :-  %say
 |=([^ [where=path tym=@da eve=@t ~] ~] kiln-schedule/[where tym eve])
diff --git a/gen/hood/unlink.hoon b/gen/hood/unlink.hoon
index 033fa34d5..d04136199 100644
--- a/gen/hood/unlink.hoon
+++ b/gen/hood/unlink.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/link/hood/gen
+::::  /hoon/unlink/hood/gen
   ::
 /?  314
 ::
diff --git a/gen/hood/unmount.hoon b/gen/hood/unmount.hoon
index 63f77ce7f..0dd2e2bdc 100644
--- a/gen/hood/unmount.hoon
+++ b/gen/hood/unmount.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/mount/hood/gen
+::::  /hoon/unmount/hood/gen
   ::
 /?  314
 ::
diff --git a/gen/hood/verb.hoon b/gen/hood/verb.hoon
index 2752ee691..6fc79ec3b 100644
--- a/gen/hood/verb.hoon
+++ b/gen/hood/verb.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/verb/hood/gun
+::::  /hoon/verb/hood/gen
   ::
 /?  314
 /-  sole
diff --git a/gen/ls/subdir.hoon b/gen/ls/subdir.hoon
index 1bdd6f279..5c2a477ba 100644
--- a/gen/ls/subdir.hoon
+++ b/gen/ls/subdir.hoon
@@ -1,3 +1,6 @@
+::
+::::  /hoon/subdir/ls/gen
+  ::
 |%
 ++  subdir
   |=  [pax=path des=(map ,@t ,~)]
diff --git a/gen/make.hoon b/gen/make.hoon
index 0c7da0f69..14ff1de76 100644
--- a/gen/make.hoon
+++ b/gen/make.hoon
@@ -1,2 +1,5 @@
+::
+::::  /hoon/make/gen
+  ::
 :-  %say
 |=([^ arg=(list ,@) foo=_`@`1 bar=_`@`2] noun/[arg foo bar])
\ No newline at end of file
diff --git a/gen/moon.hoon b/gen/moon.hoon
index 179ef1cb2..5f0440e06 100644
--- a/gen/moon.hoon
+++ b/gen/moon.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/ticket/gen
+::::  /hoon/moon/gen
   ::
 /?  314
 ::
diff --git a/gen/pope.hoon b/gen/pope.hoon
index 073802899..cb01d14f3 100644
--- a/gen/pope.hoon
+++ b/gen/pope.hoon
@@ -1,3 +1,6 @@
+::
+::::  /hoon/pope/gen
+  ::
 ::  Input twitter keys
 /-    sole
 !:
diff --git a/gen/talk/load.hoon b/gen/talk/load.hoon
new file mode 100644
index 000000000..c4dee4971
--- /dev/null
+++ b/gen/talk/load.hoon
@@ -0,0 +1,12 @@
+::
+::::  /hoon/load/talk/gen
+  ::
+/?  314
+::
+::::
+  !:
+:-  %say
+|=  $:  [now=@da eny=@uvI byk=beak]
+        [[man=span ~] ~]
+    ==
+[%talk-load man]
diff --git a/gen/talk/log.hoon b/gen/talk/log.hoon
new file mode 100644
index 000000000..1916e1cab
--- /dev/null
+++ b/gen/talk/log.hoon
@@ -0,0 +1,12 @@
+::
+::::  /hoon/log/talk/gen
+  ::
+/?  314
+::
+::::
+  !:
+:-  %say
+|=  $:  [now=@da eny=@uvI byk=beak]
+        [[man=span ~] ~]
+    ==
+[%talk-log man]
diff --git a/gen/talk/save.hoon b/gen/talk/save.hoon
new file mode 100644
index 000000000..15d64094b
--- /dev/null
+++ b/gen/talk/save.hoon
@@ -0,0 +1,12 @@
+::
+::::  /hoon/save/talk/gen
+  ::
+/?  314
+::
+::::
+  !:
+:-  %say
+|=  $:  [now=@da eny=@uvI byk=beak]
+        [[man=span ~] ~]
+    ==
+[%talk-save man]
diff --git a/gen/talk/unlog.hoon b/gen/talk/unlog.hoon
new file mode 100644
index 000000000..bcf438c75
--- /dev/null
+++ b/gen/talk/unlog.hoon
@@ -0,0 +1,12 @@
+::
+::::  /hoon/unlog/talk/gen
+  ::
+/?  314
+::
+::::
+  !:
+:-  %say
+|=  $:  [now=@da eny=@uvI byk=beak]
+        [[man=span ~] ~]
+    ==
+[%talk-unlog man]
diff --git a/lib/down-jet/parse.hoon b/lib/down-jet/parse.hoon
index 25c97c889..683fc8570 100644
--- a/lib/down-jet/parse.hoon
+++ b/lib/down-jet/parse.hoon
@@ -1,6 +1,6 @@
 ::    Core markdown parser, exposed as ++parse
 ::
-::::
+::::  /hoon/parse/down-jet/lib
   ::
 =+  =~
 |%
diff --git a/lib/down-jet/rend.hoon b/lib/down-jet/rend.hoon
index cd9b38611..27cba8793 100644
--- a/lib/down-jet/rend.hoon
+++ b/lib/down-jet/rend.hoon
@@ -1,6 +1,6 @@
 ::    ++down rendering arms
 !:
-::::
+::::  /hoon/rend/down-jet/lib
   ::
 |%
 ++  into-inner
diff --git a/lib/react.hoon b/lib/react.hoon
index c75e219de..9cea47e7c 100644
--- a/lib/react.hoon
+++ b/lib/react.hoon
@@ -1,3 +1,6 @@
+::
+::::  /hoon/react/lib
+  ::
 !:
 |%
 ++  react-elems ::  XX /~
diff --git a/lib/tree.hoon b/lib/tree.hoon
index 9161cd6fc..632ddffc0 100644
--- a/lib/tree.hoon
+++ b/lib/tree.hoon
@@ -1,3 +1,6 @@
+::
+::::  /hoon/tree/lib
+  ::
 /-  tree-include
 !:
 |%
diff --git a/mar/coffee.hoon b/mar/coffee.hoon
index d34dd5d29..5897a3339 100644
--- a/mar/coffee.hoon
+++ b/mar/coffee.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/core/md/pro
+::::  /hoon/coffee/mar
   ::
 /?  314
 |_  mud=@t
diff --git a/mar/comment-md.hoon b/mar/comment-md.hoon
index 820866bf3..01c9d3f34 100644
--- a/mar/comment-md.hoon
+++ b/mar/comment-md.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/core/md/pro
+::::  /hoon/comment-md/mar
   ::
 /?  314
 ::
diff --git a/mar/css.hoon b/mar/css.hoon
index b84027f2c..4e0c1a53f 100644
--- a/mar/css.hoon
+++ b/mar/css.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/core/css/mar
+::::  /hoon/css/mar
   ::
 |_  mud=@t
 ++  grow                                                ::  convert to
diff --git a/mar/dill/belt.hoon b/mar/dill/belt.hoon
index 18a6f1106..a6008ddb2 100644
--- a/mar/dill/belt.hoon
+++ b/mar/dill/belt.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/dill-belt/mar
+::::  /hoon/belt/dill/mar
   ::
 /?    314
 /-    kyev,sole
diff --git a/mar/dill/blit.hoon b/mar/dill/blit.hoon
index d6aa6cecf..ff712794a 100644
--- a/mar/dill/blit.hoon
+++ b/mar/dill/blit.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/dill-blit/mar
+::::  /hoon/blit/dill/mar
   ::
 /?    314
 /-    sole
diff --git a/mar/elem.hoon b/mar/elem.hoon
index 3164362c8..cfcd3fe87 100644
--- a/mar/elem.hoon
+++ b/mar/elem.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/core/elem/mar
+::::  /hoon/elem/mar
   ::
 /?  314
 |_  own=manx
diff --git a/mar/front.hoon b/mar/front.hoon
new file mode 100644
index 000000000..602612f77
--- /dev/null
+++ b/mar/front.hoon
@@ -0,0 +1,20 @@
+::
+::::  /hoon/front/mar
+  ::
+/?    314
+!:
+::::
+  ::
+|_  all=(map span cord)
+::
+++  grow                                                         ::  convert to
+  |%
+  ++  json
+    :-  %o
+    %-  ~(run by all)
+    |=(a=cord s/a)
+  --
+++  grab  |%                                                     ::  convert from
+          ++  noun  (map span cord)                              ::  clam from %noun
+          :: ++  elem  ,~
+--        --
diff --git a/mar/hoon.hoon b/mar/hoon.hoon
index 54418e920..10792069f 100644
--- a/mar/hoon.hoon
+++ b/mar/hoon.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/hook/mar
+::::  /hoon/hoon/mar
   ::
 /?  314
 !:
diff --git a/mar/html.hoon b/mar/html.hoon
index 192a2ab09..08258ab24 100644
--- a/mar/html.hoon
+++ b/mar/html.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/core/html/mar
+::::  /hoon/html/mar
   ::
 /?  314
   ::
diff --git a/mar/hymn.hoon b/mar/hymn.hoon
index 43153b94f..62974a3a8 100644
--- a/mar/hymn.hoon
+++ b/mar/hymn.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/core/hymn/mar
+::::  /hoon/hymn/mar
   ::
 /?  314
 |_  own=manx
diff --git a/mar/jam.hoon b/mar/jam.hoon
index a11a4103c..592e34fdc 100644
--- a/mar/jam.hoon
+++ b/mar/jam.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/core/jam/mar
+::::  /hoon/jam/mar
   ::
 !:
 |_  mud=@
diff --git a/mar/js.hoon b/mar/js.hoon
index 1bb720ed1..e39ac1a12 100644
--- a/mar/js.hoon
+++ b/mar/js.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/core/js/mar
+::::  /hoon/js/mar
   ::
 !:
 |_  mud=@
diff --git a/mar/json.hoon b/mar/json.hoon
index 1350e4de0..7d42735ac 100644
--- a/mar/json.hoon
+++ b/mar/json.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/core/json/mar
+::::  /hoon/json/mar
   ::
 /?  314
   ::
diff --git a/mar/load.hoon b/mar/load.hoon
deleted file mode 100644
index de150d2aa..000000000
--- a/mar/load.hoon
+++ /dev/null
@@ -1,10 +0,0 @@
-::
-::::  /hoon/core/load/mar
-  ::
-!:
-|_  man=span
-++  grab
-  |%                                                    ::  convert from
-  ++  noun  span                                        ::  clam from %noun
-  --
---
diff --git a/mar/log.hoon b/mar/log.hoon
deleted file mode 100644
index b918040a9..000000000
--- a/mar/log.hoon
+++ /dev/null
@@ -1,10 +0,0 @@
-::
-::::  /hoon/core/log/mar
-  ::
-!:
-|_  man=span
-++  grab
-  |%                                                    ::  convert from
-  ++  noun  span                                        ::  clam from %noun
-  --
---
diff --git a/mar/markdown.hoon b/mar/markdown.hoon
index 5017e8870..22a9d10b6 100644
--- a/mar/markdown.hoon
+++ b/mar/markdown.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/core/markdown/pro
+::::  /hoon/markdown/mar
   ::
 /?  314
 ::
diff --git a/mar/md.hoon b/mar/md.hoon
index 4ed079bb6..f72045542 100644
--- a/mar/md.hoon
+++ b/mar/md.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/core/md/pro
+::::  /hoon/md/mar
   ::
 /?  314
 ::
diff --git a/mar/mime.hoon b/mar/mime.hoon
index 95932b393..b6d909c16 100644
--- a/mar/mime.hoon
+++ b/mar/mime.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/core/mime/mar
+::::  /hoon/mime/mar
   ::
 /?  314
 !:
diff --git a/mar/save.hoon b/mar/save.hoon
deleted file mode 100644
index 614b98dc4..000000000
--- a/mar/save.hoon
+++ /dev/null
@@ -1,10 +0,0 @@
-::
-::::  /hoon/core/save/mar
-  ::
-!:
-|_  man=span
-++  grab
-  |%                                                    ::  convert from
-  ++  noun  span                                        ::  clam from %noun
-  --
---
diff --git a/mar/snip.hoon b/mar/snip.hoon
index 54a8660c1..92f4d1dfb 100644
--- a/mar/snip.hoon
+++ b/mar/snip.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/core/elem/mar
+::::  /hoon/snip/mar
   ::
 /?  314
 !:
diff --git a/mar/sole/action.hoon b/mar/sole/action.hoon
index b1091afcf..30a32c2ae 100644
--- a/mar/sole/action.hoon
+++ b/mar/sole/action.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/sole-action/mar
+::::  /hoon/action/sole/mar
   ::
 /?    314
 /-    sole
diff --git a/mar/sole/effect.hoon b/mar/sole/effect.hoon
index 01518c8f8..1f2e48ced 100644
--- a/mar/sole/effect.hoon
+++ b/mar/sole/effect.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/sole-effect/mar
+::::  /hoon/effect/sole/mar
   ::
 /?    314
 /-    sole
diff --git a/mar/talk/command.hoon b/mar/talk/command.hoon
index 84cc32622..d0a412773 100644
--- a/mar/talk/command.hoon
+++ b/mar/talk/command.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/talk-command/mar
+::::  /hoon/command/talk/mar
   ::
 /?    314
 /-    talk
diff --git a/mar/talk/report.hoon b/mar/talk/report.hoon
index 944679796..e7b2e77af 100644
--- a/mar/talk/report.hoon
+++ b/mar/talk/report.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/talk-report/mar
+::::  /hoon/report/talk/mar
   ::
 /?    314
 /-    talk
diff --git a/mar/talk/telegrams.hoon b/mar/talk/telegrams.hoon
index eacff085a..a1c09445e 100644
--- a/mar/talk/telegrams.hoon
+++ b/mar/talk/telegrams.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/talk-telegrams/mar
+::::  /hoon/telegrams/talk/mar
   ::
 /?  314
 /-  talk
diff --git a/mar/tang.hoon b/mar/tang.hoon
index 9e30a6323..0d558c21d 100644
--- a/mar/tang.hoon
+++ b/mar/tang.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/core/tang/mar
+::::  /hoon/tang/mar
   ::
 /?  314
 !:
diff --git a/mar/tree-include.hoon b/mar/tree-include.hoon
index 17512efc4..f49816bad 100644
--- a/mar/tree-include.hoon
+++ b/mar/tree-include.hoon
@@ -1,3 +1,6 @@
+::
+::::  /hoon/tree-include/mar
+  ::
 /-    tree-include
 |_  tree-include
 ++  grab  |%  ++  noun  tree-include
diff --git a/mar/tree/elem.hoon b/mar/tree/elem.hoon
index 326ab130a..b24d37f6d 100644
--- a/mar/tree/elem.hoon
+++ b/mar/tree/elem.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/core/elem/mar
+::::  /hoon/elem/tree/mar
   ::
 /?  314
 |_  own=manx
diff --git a/mar/tree/hymn.hoon b/mar/tree/hymn.hoon
index 43153b94f..ce9d7ba2f 100644
--- a/mar/tree/hymn.hoon
+++ b/mar/tree/hymn.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/core/hymn/mar
+::::  /hoon/hymn/tree/mar
   ::
 /?  314
 |_  own=manx
diff --git a/mar/tree/include.hoon b/mar/tree/include.hoon
index 17512efc4..8e5053c8f 100644
--- a/mar/tree/include.hoon
+++ b/mar/tree/include.hoon
@@ -1,3 +1,6 @@
+::
+::::  /hoon/include/tree/mar
+  ::
 /-    tree-include
 |_  tree-include
 ++  grab  |%  ++  noun  tree-include
diff --git a/mar/index.hoon b/mar/tree/index.hoon
similarity index 95%
rename from mar/index.hoon
rename to mar/tree/index.hoon
index 86e6f07ea..d4bbf950a 100644
--- a/mar/index.hoon
+++ b/mar/tree/index.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/core/elem/mar
+::::  /hoon/index/tree/mar
   ::
 /?    314
 /+    tree,react
diff --git a/mar/tree/json.hoon b/mar/tree/json.hoon
index 3e03162ff..c90bff15c 100644
--- a/mar/tree/json.hoon
+++ b/mar/tree/json.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/json/mar
+::::  /hoon/json/tree/mar
   ::
 /?  314
   ::
diff --git a/mar/txt-diff.hoon b/mar/txt-diff.hoon
index dfe739a34..353742c6b 100644
--- a/mar/txt-diff.hoon
+++ b/mar/txt-diff.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/term-line/mar
+::::  /hoon/txt-diff/mar
   ::
 /?  314
 |_  txt-diff=(urge cord)
diff --git a/mar/txt.hoon b/mar/txt.hoon
index 90e3f262e..d585e5d28 100644
--- a/mar/txt.hoon
+++ b/mar/txt.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/term-line/mar
+::::  /hoon/txt/mar
   ::
 /?  314
 !:
diff --git a/mar/unlog.hoon b/mar/unlog.hoon
deleted file mode 100644
index f368207e4..000000000
--- a/mar/unlog.hoon
+++ /dev/null
@@ -1,11 +0,0 @@
-::
-::::  /hoon/core/unlog/mar
-  ::
-!:
-|_  man=span
-++  grab
-  |%                                                    ::  convert from
-  ++  noun  span                                        ::  clam from %noun
-  --
---
-
diff --git a/mar/write/comment.hoon b/mar/write/comment.hoon
index e1592f0d1..8e2e83213 100644
--- a/mar/write/comment.hoon
+++ b/mar/write/comment.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/core/save/mar
+::::  /hoon/comment/write/mar
   ::
 !:
 |_  [pax=path txt=@t]
diff --git a/mar/write/paste.hoon b/mar/write/paste.hoon
index 10117692b..cd4b4ba48 100644
--- a/mar/write/paste.hoon
+++ b/mar/write/paste.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/core/save/mar
+::::  /hoon/paste/write/mar
   ::
 !:
 |_  [typ=?(%hoon %md %txt) txt=@t]
diff --git a/mar/write/tree.hoon b/mar/write/tree.hoon
index b47fa0925..3edb505b6 100644
--- a/mar/write/tree.hoon
+++ b/mar/write/tree.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/core/save/mar
+::::  /hoon/tree/write/mar
   ::
 !:
 |_  [sup=spur mim=mime]
diff --git a/mar/write/wipe.hoon b/mar/write/wipe.hoon
index 3106ac9f8..bc062ac60 100644
--- a/mar/write/wipe.hoon
+++ b/mar/write/wipe.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/core/save/mar
+::::  /hoon/wipe/write/mar
   ::
 !:
 |_  spur
diff --git a/mar/xml.hoon b/mar/xml.hoon
index 580a1ec0c..679e1d1fb 100644
--- a/mar/xml.hoon
+++ b/mar/xml.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/core/html/mar
+::::  /hoon/xml/mar
   ::
 /?  314
   ::
diff --git a/ren/tree/combine.hoon b/ren/tree/combine.hoon
index e463fb97c..b59b93257 100644
--- a/ren/tree/combine.hoon
+++ b/ren/tree/combine.hoon
@@ -1,21 +1,24 @@
-/+    tree, react
+::
+::::  /hoon/combine/tree/ren
+  ::
+/-    tree-include
+/+    react
 /=    mime    /mime/
 /=    body    /tree-elem/
-/=    sect    /tree-index/
+/=    sect    /&json&/tree-index/
 /=    snip    /&snip&elem&/tree-elem/
-/=    meta    /^  (map span cord)  /|(/front/ /~[~])
+/=    meta    /&json&front&/|(/front/ /~[~])
 /=    comt    /^  (list (pair time manx))
               /@    /&elem&md&mime&/comment-md/
 !:
 ^-    tree-include
 =+  rj=react-to-json:react
-=+  ij=(map-to-json:tree |=(a=path (crip (spud a))) |=(a=marl [%a (turn a rj)]))
 =+  cj=|=([a=time b=manx] (jobe time/(jode a) body/(rj b) ~))
 :*  mime
     (rj body)
     (rj /h1 hed.snip)   :: head
     (rj /div tal.snip)  :: snip
-    [%o (~(run by meta) |=(a=span s/a))]
-    (ij sect)
+    meta
+    sect
     [%a (turn (sort comt lor) cj)]
 ==
diff --git a/ren/tree/elem.hoon b/ren/tree/elem.hoon
index 486ff225f..3aa0aa340 100644
--- a/ren/tree/elem.hoon
+++ b/ren/tree/elem.hoon
@@ -1,3 +1,6 @@
+::
+::::  /hoon/elem/tree/ren
+  ::
 /%    /,
     /web   /|(/!elem/ /elem/)
     /      /elem/
diff --git a/ren/tree/hymn.hoon b/ren/tree/hymn.hoon
index 150b3c859..c2ad5d73d 100644
--- a/ren/tree/hymn.hoon
+++ b/ren/tree/hymn.hoon
@@ -1,4 +1,7 @@
 ::
+::::  /hoon/hymn/tree/ren
+  ::
+::
 /?    314
 /-    tree-include
 /=    dat    /%  /tree-json/ :: default include
diff --git a/ren/tree/include.hoon b/ren/tree/include.hoon
index 1634a765a..1401fde65 100644
--- a/ren/tree/include.hoon
+++ b/ren/tree/include.hoon
@@ -1,3 +1,6 @@
+::
+::::  /hoon/include/tree/ren
+  ::
 /-    tree-include
 /|    /tree-combine/
       /:/===/web/404:/tree-combine/    ::  XX merge into tree-elem?
diff --git a/ren/tree/index.hoon b/ren/tree/index.hoon
index 0ffc3dc6f..d1128f3fe 100644
--- a/ren/tree/index.hoon
+++ b/ren/tree/index.hoon
@@ -1,3 +1,6 @@
+::
+::::  /hoon/index/tree/ren
+  ::
 /+    tree
 /,        /
     /;  (getall:tree /h1/h2/h3/h4/h5/h6)  /tree-elem/
diff --git a/ren/tree/json.hoon b/ren/tree/json.hoon
index a2a4666e8..356f28664 100644
--- a/ren/tree/json.hoon
+++ b/ren/tree/json.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hook/json/tree
+::::  /hoon/json/tree/ren
   ::
 /?    314
 /+    tree
diff --git a/ren/urb.hoon b/ren/urb.hoon
index dd629dbef..753aa8c2d 100644
--- a/ren/urb.hoon
+++ b/ren/urb.hoon
@@ -1,3 +1,6 @@
+::
+::::  /hoon/urb/ren
+  ::
 /%    /,
     /talk/log  /talklog-hymn/
     /web/app   /|(/!hymn/ /tree-hymn/)
diff --git a/sur/down.hoon b/sur/down.hoon
index cb179c8bd..56ab3f5c8 100644
--- a/sur/down.hoon
+++ b/sur/down.hoon
@@ -1,5 +1,5 @@
 ::
-::::  /hoon/gate/down/sur
+::::  /hoon/down/sur
   ::
 /?  314
 /-  markdown
diff --git a/sur/markdown.hoon b/sur/markdown.hoon
index 0ca8b8508..a1204d060 100644
--- a/sur/markdown.hoon
+++ b/sur/markdown.hoon
@@ -1,3 +1,6 @@
+::
+::::  /hoon/markdown/sur
+  ::
 |%
 ++  down  (list elem)
 ++  kids  (list inline)
diff --git a/sur/tree-include.hoon b/sur/tree-include.hoon
index b0330376d..475298f81 100644
--- a/sur/tree-include.hoon
+++ b/sur/tree-include.hoon
@@ -1,3 +1,6 @@
+::
+::::  /hoon/tree-include/sur
+  ::
 |-
 $:  mime=mime
     body=json
diff --git a/web/dojo.hoon b/web/dojo.hoon
index cf4ce9d8d..54662d5d3 100644
--- a/web/dojo.hoon
+++ b/web/dojo.hoon
@@ -1,6 +1,6 @@
 ::    Console front-end
 ::
-::::  /hook/hymn/dojo/web
+::::  /hoon/dojo/web
   ::
 /?    310
 |%
diff --git a/web/talk.hoon b/web/talk.hoon
index eb3efaf0e..2dea98b1c 100644
--- a/web/talk.hoon
+++ b/web/talk.hoon
@@ -1,3 +1,6 @@
+::
+::::  /hoon/talk/web
+  ::
 ;module(nav_title "Talk", nav_no-dpad "", nav_no-sibs "", nav_subnav "talk-station")
   ;script@"/~~/~/at/lib/urb.js";
   ;script@"/talk/main.js";