diff --git a/build.zig b/build.zig
index 2ac88948c0..a053912518 100644
--- a/build.zig
+++ b/build.zig
@@ -687,20 +687,20 @@ fn build_single(
             "serial.c",
             "trace.c",
             "urth.c",
-            "allocate_v1.c",
-            "hashtable_v1.c",
-            "jets_v1.c",
-            "manage_v1.c",
-            "nock_v1.c",
-            "vortex_v1.c",
-            "allocate_v2.c",
-            "hashtable_v2.c",
-            "jets_v2.c",
-            "manage_v2.c",
-            "nock_v2.c",
-            "vortex_v2.c",
-            "hashtable_v3.c",
-            "manage_v3.c",
+            "v1/allocate.c",
+            "v1/hashtable.c",
+            "v1/jets.c",
+            "v1/manage.c",
+            "v1/nock.c",
+            "v1/vortex.c",
+            "v2/allocate.c",
+            "v2/hashtable.c",
+            "v2/jets.c",
+            "v2/manage.c",
+            "v2/nock.c",
+            "v2/vortex.c",
+            "v3/hashtable.c",
+            "v3/manage.c",
             "vortex.c",
             "xtract.c",
             "zave.c",
@@ -710,17 +710,13 @@ fn build_single(
 
     pkg_noun.installHeadersDirectory(b.path("pkg/noun"), "", .{
         .include_extensions = &.{".h"},
+        .exclude_extensions = &.{"rsignal.h"},
     });
-
-    pkg_noun.installHeadersDirectory(b.path(switch (t.os.tag) {
-        .macos => "pkg/noun/platform/darwin",
-        .linux => "pkg/noun/platform/linux",
+    pkg_noun.installHeader(b.path(switch (t.os.tag) {
+        .macos => "pkg/noun/platform/darwin/rsignal.h",
+        .linux => "pkg/noun/platform/linux/rsignal.h",
         else => "",
-    }), "", .{});
-
-    pkg_noun.installHeadersDirectory(b.path("pkg/noun/jets"), "", .{
-        .include_extensions = &.{".h"},
-    });
+    }), "rsignal.h");
 
     // b.installArtifact(pkg_noun);
 
diff --git a/pkg/noun/manage.c b/pkg/noun/manage.c
index e5dbcab223..4d85303ac0 100644
--- a/pkg/noun/manage.c
+++ b/pkg/noun/manage.c
@@ -1,8 +1,8 @@
 /// @file
 
 #include "manage.h"
-#include "manage_v2.h"
-#include "manage_v3.h"
+#include "v2/manage.h"
+#include "v3/manage.h"
 
 #include <ctype.h>
 #include <dlfcn.h>
diff --git a/pkg/noun/manage.h b/pkg/noun/manage.h
index 9b220706df..46a8bcb61e 100644
--- a/pkg/noun/manage.h
+++ b/pkg/noun/manage.h
@@ -3,8 +3,8 @@
 #ifndef U3_MANAGE_H
 #define U3_MANAGE_H
 
-#include "manage_v1.h"
-#include "manage_v2.h"
+#include "v1/manage.h"
+#include "v2/manage.h"
 
 #include "c3/c3.h"
 #include "types.h"
diff --git a/pkg/noun/v1/allocate.c b/pkg/noun/v1/allocate.c
index 3d4a31d5d9..da7848e0a0 100644
--- a/pkg/noun/v1/allocate.c
+++ b/pkg/noun/v1/allocate.c
@@ -1,9 +1,9 @@
 /// @file
 
 #include "allocate.h"
-#include "allocate_v1.h"
+#include "v1/allocate.h"
 
-#include "hashtable_v1.h"
+#include "v1/hashtable.h"
 
 /* _box_v1_slot(): select the right free list to search for a block.
 */
diff --git a/pkg/noun/v1/allocate.h b/pkg/noun/v1/allocate.h
index 097d9b10a5..8b92de808e 100644
--- a/pkg/noun/v1/allocate.h
+++ b/pkg/noun/v1/allocate.h
@@ -2,7 +2,7 @@
 #define U3_ALLOCATE_V1_H
 
 #include "allocate.h"
-#include "allocate_v2.h"
+#include "v2/allocate.h"
 
   /**  Aliases.
   **/
diff --git a/pkg/noun/v1/hashtable.c b/pkg/noun/v1/hashtable.c
index 01126c9303..469c1ed3bf 100644
--- a/pkg/noun/v1/hashtable.c
+++ b/pkg/noun/v1/hashtable.c
@@ -1,10 +1,10 @@
 /// @file
 
 #include "hashtable.h"
-#include "hashtable_v1.h"
+#include "v1/hashtable.h"
 
 #include "allocate.h"
-#include "allocate_v1.h"
+#include "v1/allocate.h"
 
 
 /* _ch_v1_popcount(): number of bits set in word.  A standard intrinsic.
diff --git a/pkg/noun/v1/hashtable.h b/pkg/noun/v1/hashtable.h
index c56fe87516..a9dd04926c 100644
--- a/pkg/noun/v1/hashtable.h
+++ b/pkg/noun/v1/hashtable.h
@@ -2,7 +2,7 @@
 #define U3_HASHTABLE_V1_H
 
 #include "hashtable.h"
-#include "hashtable_v2.h"
+#include "v2/hashtable.h"
 
   /**  Aliases.
   **/
diff --git a/pkg/noun/v1/jets.c b/pkg/noun/v1/jets.c
index 1b091cfee6..910f8729fa 100644
--- a/pkg/noun/v1/jets.c
+++ b/pkg/noun/v1/jets.c
@@ -3,11 +3,11 @@
 #include "vortex.h"
 
 #include "jets.h"
-#include "jets_v1.h"
-#include "jets_v2.h"
+#include "v1/jets.h"
+#include "v2/jets.h"
 
-#include "allocate_v1.h"
-#include "hashtable_v1.h"
+#include "v1/allocate.h"
+#include "v1/hashtable.h"
 
 
 /* _cj_fink_free(): lose and free everything in a u3j_v1_fink.
diff --git a/pkg/noun/v1/jets.h b/pkg/noun/v1/jets.h
index 52e3bc1bf4..e540afde69 100644
--- a/pkg/noun/v1/jets.h
+++ b/pkg/noun/v1/jets.h
@@ -4,7 +4,7 @@
 #define U3_JETS_V1_H
 
 #include "jets.h"
-#include "jets_v2.h"
+#include "v2/jets.h"
 
   /**  Aliases.
   **/
diff --git a/pkg/noun/v1/manage.c b/pkg/noun/v1/manage.c
index 03595c35a2..5e353d3446 100644
--- a/pkg/noun/v1/manage.c
+++ b/pkg/noun/v1/manage.c
@@ -1,12 +1,12 @@
 /// @file
 
-#include "manage_v1.h"
+#include "v1/manage.h"
 
-#include "allocate_v1.h"
-#include "hashtable_v1.h"
-#include "jets_v1.h"
-#include "nock_v1.h"
-#include "vortex_v1.h"
+#include "v1/allocate.h"
+#include "v1/hashtable.h"
+#include "v1/jets.h"
+#include "v1/nock.h"
+#include "v1/vortex.h"
 
 /* u3m_v1_reclaim: clear persistent caches to reclaim memory
 */
diff --git a/pkg/noun/v1/nock.c b/pkg/noun/v1/nock.c
index fc70ace4ad..242fe8232b 100644
--- a/pkg/noun/v1/nock.c
+++ b/pkg/noun/v1/nock.c
@@ -1,12 +1,12 @@
 /// @file
 
 #include "nock.h"
-#include "nock_v1.h"
+#include "v1/nock.h"
 
-#include "allocate_v1.h"
-#include "hashtable_v1.h"
+#include "v1/allocate.h"
+#include "v1/hashtable.h"
 #include "jets.h"
-#include "jets_v1.h"
+#include "v1/jets.h"
 
 /* u3n_v1_reclaim(): clear ad-hoc persistent caches to reclaim memory.
 */
diff --git a/pkg/noun/v1/nock.h b/pkg/noun/v1/nock.h
index 6b335d94de..3df2951975 100644
--- a/pkg/noun/v1/nock.h
+++ b/pkg/noun/v1/nock.h
@@ -3,7 +3,7 @@
 #ifndef U3_NOCK_V1_H
 #define U3_NOCK_V1_H
 
-#include "nock_v2.h"
+#include "v2/nock.h"
 
   /**  Aliases.
   **/
diff --git a/pkg/noun/v1/vortex.c b/pkg/noun/v1/vortex.c
index a0cd95bf3f..22702f2126 100644
--- a/pkg/noun/v1/vortex.c
+++ b/pkg/noun/v1/vortex.c
@@ -1,9 +1,9 @@
 /// @file
 
 #include "vortex.h"
-#include "vortex_v1.h"
+#include "v1/vortex.h"
 
-#include "allocate_v1.h"
+#include "v1/allocate.h"
 
 /* u3v_v1_reclaim(): clear ad-hoc persistent caches to reclaim memory.
 */
diff --git a/pkg/noun/v1/vortex.h b/pkg/noun/v1/vortex.h
index e158a28173..38612dda0c 100644
--- a/pkg/noun/v1/vortex.h
+++ b/pkg/noun/v1/vortex.h
@@ -4,7 +4,7 @@
 #define U3_VORTEX_V1_H
 
 #include "allocate.h"
-#include "vortex_v2.h"
+#include "v2/vortex.h"
 
   /**  Aliases.
   **/
diff --git a/pkg/noun/v2/allocate.c b/pkg/noun/v2/allocate.c
index e99808d1b2..59d6dab2c8 100644
--- a/pkg/noun/v2/allocate.c
+++ b/pkg/noun/v2/allocate.c
@@ -1,12 +1,12 @@
 /// @file
 
 #include "allocate.h"
-#include "allocate_v1.h"
-#include "allocate_v2.h"
+#include "v1/allocate.h"
+#include "v2/allocate.h"
 
-#include "hashtable_v2.h"
+#include "v2/hashtable.h"
 #include "log.h"
-#include "manage_v2.h"
+#include "v2/manage.h"
 #include "options.h"
 #include "retrieve.h"
 #include "trace.h"
diff --git a/pkg/noun/v2/allocate.h b/pkg/noun/v2/allocate.h
index 7a9acd034b..b5d7e51957 100644
--- a/pkg/noun/v2/allocate.h
+++ b/pkg/noun/v2/allocate.h
@@ -1,9 +1,9 @@
 #ifndef U3_ALLOCATE_V2_H
 #define U3_ALLOCATE_V2_H
 
-#include "allocate.h"
+#include <allocate.h>
 
-#include "manage_v2.h"
+#include "v2/manage.h"
 #include "options.h"
 
   /**  Aliases.
diff --git a/pkg/noun/v2/hashtable.c b/pkg/noun/v2/hashtable.c
index adb714f7e2..c31c17c1db 100644
--- a/pkg/noun/v2/hashtable.c
+++ b/pkg/noun/v2/hashtable.c
@@ -1,12 +1,12 @@
 /// @file
 
 #include "hashtable.h"
-#include "hashtable_v1.h"
-#include "hashtable_v2.h"
+#include "v1/hashtable.h"
+#include "v2/hashtable.h"
 
 #include "allocate.h"
-#include "allocate_v1.h"
-#include "allocate_v2.h"
+#include "v1/allocate.h"
+#include "v2/allocate.h"
 
 /* _ch_v2_popcount(): number of bits set in word.  A standard intrinsic.
 **             NB: copy of _ch_v2_popcount in pkg/noun/hashtable.c
diff --git a/pkg/noun/v2/hashtable.h b/pkg/noun/v2/hashtable.h
index 5a637e2d71..ec681ef88c 100644
--- a/pkg/noun/v2/hashtable.h
+++ b/pkg/noun/v2/hashtable.h
@@ -13,7 +13,7 @@
 #define u3h_v2_walk          u3h_walk
 #define u3h_v2_walk_with     u3h_walk_with
 
-#include "hashtable.h"
+#include <hashtable.h>
 
 #include "c3/c3.h"
 #include "types.h"
diff --git a/pkg/noun/v2/jets.c b/pkg/noun/v2/jets.c
index 6d30839390..d754aea17e 100644
--- a/pkg/noun/v2/jets.c
+++ b/pkg/noun/v2/jets.c
@@ -3,14 +3,14 @@
 #include "vortex.h"
 
 #include "jets.h"
-#include "jets_v2.h"
+#include "v2/jets.h"
 
-#include "allocate_v2.h"
-#include "hashtable_v2.h"
-#include "vortex_v2.h"
+#include "v2/allocate.h"
+#include "v2/hashtable.h"
+#include "v2/vortex.h"
 
-#include "hashtable_v3.h"
-#include "jets_v3.h"
+#include "v3/hashtable.h"
+#include "v3/jets.h"
 
 /* u3j_v2_reclaim(): clear ad-hoc persistent caches to reclaim memory.
 */
diff --git a/pkg/noun/v2/jets.h b/pkg/noun/v2/jets.h
index 414adf58d2..f9d2118bd1 100644
--- a/pkg/noun/v2/jets.h
+++ b/pkg/noun/v2/jets.h
@@ -4,7 +4,7 @@
 #define U3_JETS_V2_H
 
 #include "allocate.h"
-#include "jets.h"
+#include <jets.h>
 
 
   /**  Aliases.
diff --git a/pkg/noun/v2/manage.c b/pkg/noun/v2/manage.c
index 85dd39233a..57ec82c1f3 100644
--- a/pkg/noun/v2/manage.c
+++ b/pkg/noun/v2/manage.c
@@ -1,16 +1,16 @@
 /// @file
 
-#include "manage_v2.h"
-
-#include "allocate_v1.h"
-#include "allocate_v2.h"
-#include "hashtable_v2.h"
-#include "jets_v2.h"
-#include "nock_v2.h"
-#include "options_v2.h"
+#include "v2/manage.h"
+
+#include "v1/allocate.h"
+#include "v2/allocate.h"
+#include "v2/hashtable.h"
+#include "v2/jets.h"
+#include "v2/nock.h"
+#include "v2/options.h"
 #include "vortex.h"
-#include "vortex_v1.h"
-#include "vortex_v2.h"
+#include "v1/vortex.h"
+#include "v2/vortex.h"
 
 /* _cm_pack_rewrite(): trace through arena, rewriting pointers.
 */
diff --git a/pkg/noun/v2/nock.c b/pkg/noun/v2/nock.c
index 0558815786..530aac884b 100644
--- a/pkg/noun/v2/nock.c
+++ b/pkg/noun/v2/nock.c
@@ -1,14 +1,14 @@
 /// @file
 
-#include "nock_v2.h"
+#include "v2/nock.h"
 
 #include "vortex.h"
 
-#include "allocate_v2.h"
-#include "hashtable_v2.h"
-#include "vortex_v2.h"
+#include "v2/allocate.h"
+#include "v2/hashtable.h"
+#include "v2/vortex.h"
 
-#include "hashtable_v3.h"
+#include "v3/hashtable.h"
 
 /* u3n_v2_reclaim(): clear ad-hoc persistent caches to reclaim memory.
 */
diff --git a/pkg/noun/v2/nock.h b/pkg/noun/v2/nock.h
index 9662ba3241..efb91219be 100644
--- a/pkg/noun/v2/nock.h
+++ b/pkg/noun/v2/nock.h
@@ -3,9 +3,9 @@
 #ifndef U3_NOCK_V2_H
 #define U3_NOCK_V2_H
 
-#include "nock_v3.h"
+#include "v3/nock.h"
 
-#include "jets_v2.h"
+#include "v2/jets.h"
 
 #include "types.h"
 
diff --git a/pkg/noun/v2/options.h b/pkg/noun/v2/options.h
index c0684f5fb4..a4d6b79a8a 100644
--- a/pkg/noun/v2/options.h
+++ b/pkg/noun/v2/options.h
@@ -3,7 +3,7 @@
 #ifndef U3_OPTIONS_V2_H
 #define U3_OPTIONS_V2_H
 
-#include "options.h"
+#include <options.h>
 
   /** Globals.
   **/
diff --git a/pkg/noun/v2/vortex.c b/pkg/noun/v2/vortex.c
index 5e41447853..729f26a1ed 100644
--- a/pkg/noun/v2/vortex.c
+++ b/pkg/noun/v2/vortex.c
@@ -1,9 +1,9 @@
 /// @file
 
 #include "vortex.h"
-#include "vortex_v2.h"
+#include "v2/vortex.h"
 
-#include "allocate_v2.h"
+#include "v2/allocate.h"
 
 u3v_v2_home* u3v_v2_Home;
 
diff --git a/pkg/noun/v2/vortex.h b/pkg/noun/v2/vortex.h
index 0897e0f14e..5af1890cc0 100644
--- a/pkg/noun/v2/vortex.h
+++ b/pkg/noun/v2/vortex.h
@@ -3,9 +3,9 @@
 #ifndef U3_VORTEX_V2_H
 #define U3_VORTEX_V2_H
 
-#include "vortex.h"
+#include <vortex.h>
 
-#include "allocate_v2.h"
+#include "v2/allocate.h"
 #include "version.h"
 
   /**  Aliases.
diff --git a/pkg/noun/v3/allocate.h b/pkg/noun/v3/allocate.h
index 3231d96af0..13def244a0 100644
--- a/pkg/noun/v3/allocate.h
+++ b/pkg/noun/v3/allocate.h
@@ -3,7 +3,7 @@
 
 #include "allocate.h"
 
-#include "manage_v3.h"
+#include "v3/manage.h"
 #include "options.h"
 
   /**  Aliases.
diff --git a/pkg/noun/v3/hashtable.c b/pkg/noun/v3/hashtable.c
index 746a9a6d52..7888300d6a 100644
--- a/pkg/noun/v3/hashtable.c
+++ b/pkg/noun/v3/hashtable.c
@@ -1,12 +1,12 @@
 /// @file
 
-#include "hashtable_v3.h"
+#include "v3/hashtable.h"
 
 #include "allocate.h"
 #include "vortex.h"
 
-#include "allocate_v3.h"
-#include "vortex_v3.h"
+#include "v3/allocate.h"
+#include "v3/vortex.h"
 
 /* u3h_v3_new_cache(): create hashtable with bounded size.
 */
diff --git a/pkg/noun/v3/hashtable.h b/pkg/noun/v3/hashtable.h
index 65249da054..91c6b21596 100644
--- a/pkg/noun/v3/hashtable.h
+++ b/pkg/noun/v3/hashtable.h
@@ -6,7 +6,7 @@
 #define u3h_v3_root          u3h_root
 #define u3h_v3_walk          u3h_walk
 
-#include "hashtable.h"
+#include <hashtable.h>
 
   /**  Functions.
   **/
diff --git a/pkg/noun/v3/manage.c b/pkg/noun/v3/manage.c
index 05b82b307b..10092db0bd 100644
--- a/pkg/noun/v3/manage.c
+++ b/pkg/noun/v3/manage.c
@@ -1,16 +1,16 @@
 /// @file
 
-#include "manage_v3.h"
+#include "v3/manage.h"
 
-#include "jets_v2.h"
-#include "nock_v2.h"
-#include "vortex_v2.h"
+#include "v2/jets.h"
+#include "v2/nock.h"
+#include "v2/vortex.h"
 
-#include "allocate_v3.h"
-#include "hashtable_v3.h"
+#include "v3/allocate.h"
+#include "v3/hashtable.h"
 #include "version.h"
-#include "vortex_v3.h"
-#include <allocate_v2.h>
+#include "v3/vortex.h"
+#include "v2/allocate.h"
 
 /* u3m_v3_migrate: perform loom migration if necessary.
 */
diff --git a/pkg/noun/v3/vortex.h b/pkg/noun/v3/vortex.h
index 117ed32f17..72d7fa4f82 100644
--- a/pkg/noun/v3/vortex.h
+++ b/pkg/noun/v3/vortex.h
@@ -3,9 +3,9 @@
 #ifndef U3_VORTEX_V3_H
 #define U3_VORTEX_V3_H
 
-#include "vortex.h"
+#include <vortex.h>
 
-#include "allocate_v3.h"
+#include "v3/allocate.h"
 #include "version.h"
 
   /**  Aliases.