diff --git a/build.zig b/build.zig
index 1408769c25..e6f1b25970 100644
--- a/build.zig
+++ b/build.zig
@@ -687,21 +687,21 @@ 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",
-            "manage_v4.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",
+            "v4/manage.c",
             "vortex.c",
             "xtract.c",
             "zave.c",
@@ -713,15 +713,11 @@ fn build_single(
         .include_extensions = &.{".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"},
-    });
+    }), "platform/rsignal.h");
 
     // b.installArtifact(pkg_noun);
 
diff --git a/pkg/noun/allocate.h b/pkg/noun/allocate.h
index 6409a31266..0fa78cdaf2 100644
--- a/pkg/noun/allocate.h
+++ b/pkg/noun/allocate.h
@@ -69,7 +69,7 @@
       typedef struct {
         c3_w mug_w;
         c3_w len_w;
-        c3_w buf_w[];
+        c3_w buf_w[0];
       } u3a_atom;
 
       typedef struct {
diff --git a/pkg/noun/jets/e/secp.c b/pkg/noun/jets/e/secp.c
index 3717d6b6ce..fa0fbd20c4 100644
--- a/pkg/noun/jets/e/secp.c
+++ b/pkg/noun/jets/e/secp.c
@@ -5,7 +5,7 @@
 
 #include "noun.h"
 #include "urcrypt.h"
-#include <ent/ent.h>
+#include "ent/ent.h"
 
 static urcrypt_secp_context* sec_u;
 
diff --git a/pkg/noun/manage.c b/pkg/noun/manage.c
index 7456a2e382..90b993469c 100644
--- a/pkg/noun/manage.c
+++ b/pkg/noun/manage.c
@@ -1,9 +1,9 @@
 /// @file
 
 #include "manage.h"
-#include "manage_v2.h"
-#include "manage_v3.h"
-#include "manage_v4.h"
+#include "v2/manage.h"
+#include "v3/manage.h"
+#include "v4/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/allocate_v1.c b/pkg/noun/v1/allocate.c
similarity index 98%
rename from pkg/noun/allocate_v1.c
rename to pkg/noun/v1/allocate.c
index 3d4a31d5d9..191e818de4 100644
--- a/pkg/noun/allocate_v1.c
+++ b/pkg/noun/v1/allocate.c
@@ -1,9 +1,9 @@
 /// @file
 
-#include "allocate.h"
-#include "allocate_v1.h"
+#include "../allocate.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/allocate_v1.h b/pkg/noun/v1/allocate.h
similarity index 97%
rename from pkg/noun/allocate_v1.h
rename to pkg/noun/v1/allocate.h
index 097d9b10a5..965db14e40 100644
--- a/pkg/noun/allocate_v1.h
+++ b/pkg/noun/v1/allocate.h
@@ -1,8 +1,8 @@
 #ifndef U3_ALLOCATE_V1_H
 #define U3_ALLOCATE_V1_H
 
-#include "allocate.h"
-#include "allocate_v2.h"
+#include "../allocate.h"
+#include "v2/allocate.h"
 
   /**  Aliases.
   **/
diff --git a/pkg/noun/hashtable_v1.c b/pkg/noun/v1/hashtable.c
similarity index 97%
rename from pkg/noun/hashtable_v1.c
rename to pkg/noun/v1/hashtable.c
index 01126c9303..6c70a94487 100644
--- a/pkg/noun/hashtable_v1.c
+++ b/pkg/noun/v1/hashtable.c
@@ -1,10 +1,10 @@
 /// @file
 
-#include "hashtable.h"
-#include "hashtable_v1.h"
+#include "../hashtable.h"
+#include "v1/hashtable.h"
 
-#include "allocate.h"
-#include "allocate_v1.h"
+#include "../allocate.h"
+#include "v1/allocate.h"
 
 
 /* _ch_v1_popcount(): number of bits set in word.  A standard intrinsic.
diff --git a/pkg/noun/hashtable_v1.h b/pkg/noun/v1/hashtable.h
similarity index 96%
rename from pkg/noun/hashtable_v1.h
rename to pkg/noun/v1/hashtable.h
index c56fe87516..74395cb74c 100644
--- a/pkg/noun/hashtable_v1.h
+++ b/pkg/noun/v1/hashtable.h
@@ -1,8 +1,8 @@
 #ifndef U3_HASHTABLE_V1_H
 #define U3_HASHTABLE_V1_H
 
-#include "hashtable.h"
-#include "hashtable_v2.h"
+#include "../hashtable.h"
+#include "v2/hashtable.h"
 
   /**  Aliases.
   **/
diff --git a/pkg/noun/jets_v1.c b/pkg/noun/v1/jets.c
similarity index 92%
rename from pkg/noun/jets_v1.c
rename to pkg/noun/v1/jets.c
index 1b091cfee6..a798ccca39 100644
--- a/pkg/noun/jets_v1.c
+++ b/pkg/noun/v1/jets.c
@@ -1,13 +1,13 @@
 /// @file
 
-#include "vortex.h"
+#include "../vortex.h"
 
-#include "jets.h"
-#include "jets_v1.h"
-#include "jets_v2.h"
+#include "../jets.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/jets_v1.h b/pkg/noun/v1/jets.h
similarity index 94%
rename from pkg/noun/jets_v1.h
rename to pkg/noun/v1/jets.h
index 52e3bc1bf4..0bcaf59e61 100644
--- a/pkg/noun/jets_v1.h
+++ b/pkg/noun/v1/jets.h
@@ -3,8 +3,8 @@
 #ifndef U3_JETS_V1_H
 #define U3_JETS_V1_H
 
-#include "jets.h"
-#include "jets_v2.h"
+#include "../jets.h"
+#include "v2/jets.h"
 
   /**  Aliases.
   **/
diff --git a/pkg/noun/manage_v1.c b/pkg/noun/v1/manage.c
similarity index 57%
rename from pkg/noun/manage_v1.c
rename to pkg/noun/v1/manage.c
index 03595c35a2..5e353d3446 100644
--- a/pkg/noun/manage_v1.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/manage_v1.h b/pkg/noun/v1/manage.h
similarity index 100%
rename from pkg/noun/manage_v1.h
rename to pkg/noun/v1/manage.h
diff --git a/pkg/noun/nock_v1.c b/pkg/noun/v1/nock.c
similarity index 92%
rename from pkg/noun/nock_v1.c
rename to pkg/noun/v1/nock.c
index fc70ace4ad..aa1dc9ca10 100644
--- a/pkg/noun/nock_v1.c
+++ b/pkg/noun/v1/nock.c
@@ -1,12 +1,12 @@
 /// @file
 
-#include "nock.h"
-#include "nock_v1.h"
+#include "../nock.h"
+#include "v1/nock.h"
 
-#include "allocate_v1.h"
-#include "hashtable_v1.h"
-#include "jets.h"
-#include "jets_v1.h"
+#include "v1/allocate.h"
+#include "v1/hashtable.h"
+#include "../jets.h"
+#include "v1/jets.h"
 
 /* u3n_v1_reclaim(): clear ad-hoc persistent caches to reclaim memory.
 */
diff --git a/pkg/noun/nock_v1.h b/pkg/noun/v1/nock.h
similarity index 95%
rename from pkg/noun/nock_v1.h
rename to pkg/noun/v1/nock.h
index 6b335d94de..3df2951975 100644
--- a/pkg/noun/nock_v1.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/vortex_v1.c b/pkg/noun/v1/vortex.c
similarity index 74%
rename from pkg/noun/vortex_v1.c
rename to pkg/noun/v1/vortex.c
index a0cd95bf3f..07daf7ab9e 100644
--- a/pkg/noun/vortex_v1.c
+++ b/pkg/noun/v1/vortex.c
@@ -1,9 +1,9 @@
 /// @file
 
-#include "vortex.h"
-#include "vortex_v1.h"
+#include "../vortex.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/vortex_v1.h b/pkg/noun/v1/vortex.h
similarity index 88%
rename from pkg/noun/vortex_v1.h
rename to pkg/noun/v1/vortex.h
index e158a28173..92743f746d 100644
--- a/pkg/noun/vortex_v1.h
+++ b/pkg/noun/v1/vortex.h
@@ -3,8 +3,8 @@
 #ifndef U3_VORTEX_V1_H
 #define U3_VORTEX_V1_H
 
-#include "allocate.h"
-#include "vortex_v2.h"
+#include "../allocate.h"
+#include "v2/vortex.h"
 
   /**  Aliases.
   **/
diff --git a/pkg/noun/allocate_v2.c b/pkg/noun/v2/allocate.c
similarity index 93%
rename from pkg/noun/allocate_v2.c
rename to pkg/noun/v2/allocate.c
index e99808d1b2..0476f8a8f5 100644
--- a/pkg/noun/allocate_v2.c
+++ b/pkg/noun/v2/allocate.c
@@ -1,12 +1,12 @@
 /// @file
 
-#include "allocate.h"
-#include "allocate_v1.h"
-#include "allocate_v2.h"
+#include "../allocate.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/allocate_v2.h b/pkg/noun/v2/allocate.h
similarity index 99%
rename from pkg/noun/allocate_v2.h
rename to pkg/noun/v2/allocate.h
index 7a9acd034b..8832977558 100644
--- a/pkg/noun/allocate_v2.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/hashtable_v2.c b/pkg/noun/v2/hashtable.c
similarity index 95%
rename from pkg/noun/hashtable_v2.c
rename to pkg/noun/v2/hashtable.c
index adb714f7e2..a4f0291bd1 100644
--- a/pkg/noun/hashtable_v2.c
+++ b/pkg/noun/v2/hashtable.c
@@ -1,12 +1,12 @@
 /// @file
 
-#include "hashtable.h"
-#include "hashtable_v1.h"
-#include "hashtable_v2.h"
+#include "../hashtable.h"
+#include "v1/hashtable.h"
+#include "v2/hashtable.h"
 
-#include "allocate.h"
-#include "allocate_v1.h"
-#include "allocate_v2.h"
+#include "../allocate.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/hashtable_v2.h b/pkg/noun/v2/hashtable.h
similarity index 97%
rename from pkg/noun/hashtable_v2.h
rename to pkg/noun/v2/hashtable.h
index 5a637e2d71..22786408f1 100644
--- a/pkg/noun/hashtable_v2.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/jets_v2.c b/pkg/noun/v2/jets.c
similarity index 87%
rename from pkg/noun/jets_v2.c
rename to pkg/noun/v2/jets.c
index 6d30839390..4d5fa0f677 100644
--- a/pkg/noun/jets_v2.c
+++ b/pkg/noun/v2/jets.c
@@ -1,16 +1,16 @@
 /// @file
 
-#include "vortex.h"
+#include "../vortex.h"
 
-#include "jets.h"
-#include "jets_v2.h"
+#include "../jets.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/jets_v2.h b/pkg/noun/v2/jets.h
similarity index 94%
rename from pkg/noun/jets_v2.h
rename to pkg/noun/v2/jets.h
index 414adf58d2..33ac088d8f 100644
--- a/pkg/noun/jets_v2.h
+++ b/pkg/noun/v2/jets.h
@@ -3,8 +3,8 @@
 #ifndef U3_JETS_V2_H
 #define U3_JETS_V2_H
 
-#include "allocate.h"
-#include "jets.h"
+#include "../allocate.h"
+#include "../jets.h"
 
 
   /**  Aliases.
diff --git a/pkg/noun/manage_v2.c b/pkg/noun/v2/manage.c
similarity index 94%
rename from pkg/noun/manage_v2.c
rename to pkg/noun/v2/manage.c
index 85dd39233a..16981d21cc 100644
--- a/pkg/noun/manage_v2.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 "vortex.h"
-#include "vortex_v1.h"
-#include "vortex_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 "v1/vortex.h"
+#include "v2/vortex.h"
 
 /* _cm_pack_rewrite(): trace through arena, rewriting pointers.
 */
diff --git a/pkg/noun/manage_v2.h b/pkg/noun/v2/manage.h
similarity index 100%
rename from pkg/noun/manage_v2.h
rename to pkg/noun/v2/manage.h
diff --git a/pkg/noun/nock_v2.c b/pkg/noun/v2/nock.c
similarity index 94%
rename from pkg/noun/nock_v2.c
rename to pkg/noun/v2/nock.c
index 0558815786..e42221a026 100644
--- a/pkg/noun/nock_v2.c
+++ b/pkg/noun/v2/nock.c
@@ -1,14 +1,14 @@
 /// @file
 
-#include "nock_v2.h"
+#include "v2/nock.h"
 
-#include "vortex.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/nock_v2.h b/pkg/noun/v2/nock.h
similarity index 97%
rename from pkg/noun/nock_v2.h
rename to pkg/noun/v2/nock.h
index 9662ba3241..efb91219be 100644
--- a/pkg/noun/nock_v2.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/options_v2.h b/pkg/noun/v2/options.h
similarity index 89%
rename from pkg/noun/options_v2.h
rename to pkg/noun/v2/options.h
index c0684f5fb4..079f766fad 100644
--- a/pkg/noun/options_v2.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/vortex_v2.c b/pkg/noun/v2/vortex.c
similarity index 86%
rename from pkg/noun/vortex_v2.c
rename to pkg/noun/v2/vortex.c
index 5e41447853..9b21d5cf01 100644
--- a/pkg/noun/vortex_v2.c
+++ b/pkg/noun/v2/vortex.c
@@ -1,9 +1,9 @@
 /// @file
 
-#include "vortex.h"
-#include "vortex_v2.h"
+#include "../vortex.h"
+#include "v2/vortex.h"
 
-#include "allocate_v2.h"
+#include "v2/allocate.h"
 
 u3v_v2_home* u3v_v2_Home;
 
diff --git a/pkg/noun/vortex_v2.h b/pkg/noun/v2/vortex.h
similarity index 92%
rename from pkg/noun/vortex_v2.h
rename to pkg/noun/v2/vortex.h
index 0897e0f14e..9e04832411 100644
--- a/pkg/noun/vortex_v2.h
+++ b/pkg/noun/v2/vortex.h
@@ -3,10 +3,10 @@
 #ifndef U3_VORTEX_V2_H
 #define U3_VORTEX_V2_H
 
-#include "vortex.h"
+#include "../vortex.h"
 
-#include "allocate_v2.h"
-#include "version.h"
+#include "v2/allocate.h"
+#include "../version.h"
 
   /**  Aliases.
   **/
diff --git a/pkg/noun/allocate_v3.h b/pkg/noun/v3/allocate.h
similarity index 87%
rename from pkg/noun/allocate_v3.h
rename to pkg/noun/v3/allocate.h
index 3231d96af0..a47cc1f459 100644
--- a/pkg/noun/allocate_v3.h
+++ b/pkg/noun/v3/allocate.h
@@ -1,9 +1,9 @@
 #ifndef U3_ALLOCATE_V3_H
 #define U3_ALLOCATE_V3_H
 
-#include "allocate.h"
+#include "../allocate.h"
 
-#include "manage_v3.h"
+#include "v3/manage.h"
 #include "options.h"
 
   /**  Aliases.
diff --git a/pkg/noun/hashtable_v3.c b/pkg/noun/v3/hashtable.c
similarity index 82%
rename from pkg/noun/hashtable_v3.c
rename to pkg/noun/v3/hashtable.c
index 746a9a6d52..3044758e20 100644
--- a/pkg/noun/hashtable_v3.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.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/hashtable_v3.h b/pkg/noun/v3/hashtable.h
similarity index 93%
rename from pkg/noun/hashtable_v3.h
rename to pkg/noun/v3/hashtable.h
index 65249da054..1d00a86296 100644
--- a/pkg/noun/hashtable_v3.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/jets_v3.h b/pkg/noun/v3/jets.h
similarity index 88%
rename from pkg/noun/jets_v3.h
rename to pkg/noun/v3/jets.h
index 1255177426..089ff647b3 100644
--- a/pkg/noun/jets_v3.h
+++ b/pkg/noun/v3/jets.h
@@ -3,7 +3,7 @@
 #ifndef U3_JETS_V3_H
 #define U3_JETS_V3_H
 
-#include "jets.h"
+#include "../jets.h"
 
   /**  Aliases.
   **/
diff --git a/pkg/noun/manage_v3.c b/pkg/noun/v3/manage.c
similarity index 92%
rename from pkg/noun/manage_v3.c
rename to pkg/noun/v3/manage.c
index 05b82b307b..0cde37a215 100644
--- a/pkg/noun/manage_v3.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 "version.h"
-#include "vortex_v3.h"
-#include <allocate_v2.h>
+#include "v3/allocate.h"
+#include "v3/hashtable.h"
+#include "../version.h"
+#include "v3/vortex.h"
+#include "v2/allocate.h"
 
 /* u3m_v3_migrate: perform loom migration if necessary.
 */
diff --git a/pkg/noun/manage_v3.h b/pkg/noun/v3/manage.h
similarity index 100%
rename from pkg/noun/manage_v3.h
rename to pkg/noun/v3/manage.h
diff --git a/pkg/noun/nock_v3.h b/pkg/noun/v3/nock.h
similarity index 93%
rename from pkg/noun/nock_v3.h
rename to pkg/noun/v3/nock.h
index 29453d99bc..ee76eb9ce4 100644
--- a/pkg/noun/nock_v3.h
+++ b/pkg/noun/v3/nock.h
@@ -3,7 +3,7 @@
 #ifndef U3_NOCK_V3_H
 #define U3_NOCK_V3_H
 
-#include "nock.h"
+#include "../nock.h"
 
 #include "types.h"
 
diff --git a/pkg/noun/vortex_v3.h b/pkg/noun/v3/vortex.h
similarity index 84%
rename from pkg/noun/vortex_v3.h
rename to pkg/noun/v3/vortex.h
index 117ed32f17..9a4c9ef071 100644
--- a/pkg/noun/vortex_v3.h
+++ b/pkg/noun/v3/vortex.h
@@ -3,10 +3,10 @@
 #ifndef U3_VORTEX_V3_H
 #define U3_VORTEX_V3_H
 
-#include "vortex.h"
+#include "../vortex.h"
 
-#include "allocate_v3.h"
-#include "version.h"
+#include "v3/allocate.h"
+#include "../version.h"
 
   /**  Aliases.
   **/
diff --git a/pkg/noun/manage_v4.c b/pkg/noun/v4/manage.c
similarity index 96%
rename from pkg/noun/manage_v4.c
rename to pkg/noun/v4/manage.c
index 14bfb52b62..0a3b72379a 100644
--- a/pkg/noun/manage_v4.c
+++ b/pkg/noun/v4/manage.c
@@ -1,6 +1,6 @@
 /// @file
 
-#include "manage_v4.h"
+#include "v4/manage.h"
 #include "stdio.h"
 #include "manage.h"
 #include "allocate.h"
diff --git a/pkg/noun/manage_v4.h b/pkg/noun/v4/manage.h
similarity index 100%
rename from pkg/noun/manage_v4.h
rename to pkg/noun/v4/manage.h
diff --git a/pkg/vere/io/ames.c b/pkg/vere/io/ames.c
index 5f2b300aa2..6d22d2eca1 100644
--- a/pkg/vere/io/ames.c
+++ b/pkg/vere/io/ames.c
@@ -10,7 +10,7 @@
 #include "zlib.h"
 #include "natpmp.h"
 
-#include <ent/ent.h>
+#include "ent/ent.h"
 
 #include <arpa/inet.h>
 
diff --git a/pkg/vere/main.c b/pkg/vere/main.c
index 21a2c9aa99..1b09ccce3f 100644
--- a/pkg/vere/main.c
+++ b/pkg/vere/main.c
@@ -6,7 +6,7 @@
 #include "events.h" // XX remove, see full replay in _cw_play()
 #include "ivory.h"
 #include "ur/ur.h"
-#include "rsignal.h"
+#include "platform/rsignal.h"
 #include "vere.h"
 #include "sigsegv.h"
 #include "openssl/conf.h"
diff --git a/pkg/vere/mars.c b/pkg/vere/mars.c
index ec27f44979..6d4af05420 100644
--- a/pkg/vere/mars.c
+++ b/pkg/vere/mars.c
@@ -2,8 +2,10 @@
 **
 **  the main loop of a mars process.
 */
+#include "c3/c3.h"
 #include "noun.h"
 #include "types.h"
+#include "vere.h"
 #include "ivory.h"
 #include "ur/ur.h"
 #include "db/lmdb.h"
diff --git a/pkg/vere/mars.h b/pkg/vere/mars.h
index 43e1958ae7..552f1a9dea 100644
--- a/pkg/vere/mars.h
+++ b/pkg/vere/mars.h
@@ -1,7 +1,5 @@
 #ifndef U3_VERE_MARS_H
 #define U3_VERE_MARS_H
-#include "c3/c3.h"
-#include "vere.h"
 
   /** Data types.
   **/
diff --git a/pkg/vere/serf.h b/pkg/vere/serf.h
index 258f7ddf1f..7cd2ca47d0 100644
--- a/pkg/vere/serf.h
+++ b/pkg/vere/serf.h
@@ -1,7 +1,5 @@
 #ifndef U3_VERE_SERF_H
 #define U3_VERE_SERF_H
-#include "c3/c3.h"
-#include "noun.h"
 
   /** Data types.
   **/
diff --git a/pkg/vere/vere.h b/pkg/vere/vere.h
index 33162ad061..71fd37fe89 100644
--- a/pkg/vere/vere.h
+++ b/pkg/vere/vere.h
@@ -3,7 +3,9 @@
 #ifndef U3_VERE_H
 #define U3_VERE_H
 
+#include "c3/c3.h"
 #include "db/lmdb.h"
+#include "noun.h"
 #include "serf.h"
 #include "uv.h"
 #include <types.h>