diff --git a/idl/IGCObject_DClosure.json5 b/idl/IGCObject_DClosure.json5
index 9e99a16b..a9b5616a 100644
--- a/idl/IGCObject_DClosure.json5
+++ b/idl/IGCObject_DClosure.json5
@@ -1,6 +1,8 @@
 {
     mode: "implementation",
     output_cpp_dir: "src/interpreter2",
+    output_hpp_dir: "include/xo/interpreter2",
+    output_impl_subdir: "detail",
     includes: [
         "<xo/gc/GCObject.hpp>",
         "<xo/alloc2/Allocator.hpp>"
diff --git a/idl/IGCObject_DLocalEnv.json5 b/idl/IGCObject_DLocalEnv.json5
index fe8670f1..1fbce208 100644
--- a/idl/IGCObject_DLocalEnv.json5
+++ b/idl/IGCObject_DLocalEnv.json5
@@ -1,6 +1,8 @@
 {
     mode: "implementation",
     output_cpp_dir: "src/interpreter2",
+    output_hpp_dir: "include/xo/interpreter2",
+    output_impl_subdir: "detail",
     includes: [
         "<xo/gc/GCObject.hpp>",
         "<xo/alloc2/Allocator.hpp>"
diff --git a/idl/IGCObject_DVsmApplyClosureFrame.json5 b/idl/IGCObject_DVsmApplyClosureFrame.json5
index 4cced151..2b68d579 100644
--- a/idl/IGCObject_DVsmApplyClosureFrame.json5
+++ b/idl/IGCObject_DVsmApplyClosureFrame.json5
@@ -1,6 +1,8 @@
 {
     mode: "implementation",
     output_cpp_dir: "src/interpreter2",
+    output_hpp_dir: "include/xo/interpreter2",
+    output_impl_subdir: "detail",
     includes: [
         "<xo/gc/GCObject.hpp>",
         "<xo/alloc2/Allocator.hpp>"
diff --git a/idl/IGCObject_DVsmApplyFrame.json5 b/idl/IGCObject_DVsmApplyFrame.json5
index 175b229e..ae284287 100644
--- a/idl/IGCObject_DVsmApplyFrame.json5
+++ b/idl/IGCObject_DVsmApplyFrame.json5
@@ -1,6 +1,8 @@
 {
     mode: "implementation",
     output_cpp_dir: "src/interpreter2",
+    output_hpp_dir: "include/xo/interpreter2",
+    output_impl_subdir: "detail",
     includes: [
         "<xo/gc/GCObject.hpp>",
         "<xo/alloc2/Allocator.hpp>"
diff --git a/idl/IGCObject_DVsmEvalArgsFrame.json5 b/idl/IGCObject_DVsmEvalArgsFrame.json5
index 7d89a5ed..d36304b8 100644
--- a/idl/IGCObject_DVsmEvalArgsFrame.json5
+++ b/idl/IGCObject_DVsmEvalArgsFrame.json5
@@ -1,6 +1,8 @@
 {
     mode: "implementation",
     output_cpp_dir: "src/interpreter2",
+    output_hpp_dir: "include/xo/interpreter2",
+    output_impl_subdir: "detail",
     includes: [
         "<xo/gc/GCObject.hpp>",
         "<xo/alloc2/Allocator.hpp>"
diff --git a/idl/IGCObject_DVsmIfElseContFrame.json5 b/idl/IGCObject_DVsmIfElseContFrame.json5
index 537c9860..63617067 100644
--- a/idl/IGCObject_DVsmIfElseContFrame.json5
+++ b/idl/IGCObject_DVsmIfElseContFrame.json5
@@ -1,6 +1,8 @@
 {
     mode: "implementation",
     output_cpp_dir: "src/interpreter2",
+    output_hpp_dir: "include/xo/interpreter2",
+    output_impl_subdir: "ifelse",
     includes: [
         "<xo/gc/GCObject.hpp>",
         "<xo/alloc2/Allocator.hpp>"
diff --git a/idl/IGCObject_DVsmSeqContFrame.json5 b/idl/IGCObject_DVsmSeqContFrame.json5
index 6945f3df..d2b68020 100644
--- a/idl/IGCObject_DVsmSeqContFrame.json5
+++ b/idl/IGCObject_DVsmSeqContFrame.json5
@@ -1,6 +1,8 @@
 {
     mode: "implementation",
     output_cpp_dir: "src/interpreter2",
+    output_hpp_dir: "include/xo/interpreter2",
+    output_impl_subdir: "sequence",
     includes: [
         "<xo/gc/GCObject.hpp>",
         "<xo/alloc2/Allocator.hpp>"
diff --git a/idl/IPrintable_DClosure.json5 b/idl/IPrintable_DClosure.json5
index 2cfb3d33..2a1e2db9 100644
--- a/idl/IPrintable_DClosure.json5
+++ b/idl/IPrintable_DClosure.json5
@@ -1,6 +1,8 @@
 {
     mode: "implementation",
     output_cpp_dir: "src/interpreter2",
+    output_hpp_dir: "include/xo/interpreter2",
+    output_impl_subdir: "detail",
     includes: [ "<xo/printable2/Printable.hpp>",
                 "<xo/printable2/detail/IPrintable_Xfer.hpp>" ],
     local_types: [ ],
diff --git a/idl/IPrintable_DLocalEnv.json5 b/idl/IPrintable_DLocalEnv.json5
index 0a1205f5..79ef4c74 100644
--- a/idl/IPrintable_DLocalEnv.json5
+++ b/idl/IPrintable_DLocalEnv.json5
@@ -1,6 +1,8 @@
 {
     mode: "implementation",
     output_cpp_dir: "src/interpreter2",
+    output_hpp_dir: "include/xo/interpreter2",
+    output_impl_subdir: "detail",
     includes: [ "<xo/printable2/Printable.hpp>",
                 "<xo/printable2/detail/IPrintable_Xfer.hpp>" ],
     local_types: [ ],
diff --git a/idl/IPrintable_DVsmApplyClosureFrame.json5 b/idl/IPrintable_DVsmApplyClosureFrame.json5
index ee4e8e64..45927399 100644
--- a/idl/IPrintable_DVsmApplyClosureFrame.json5
+++ b/idl/IPrintable_DVsmApplyClosureFrame.json5
@@ -1,6 +1,8 @@
 {
     mode: "implementation",
     output_cpp_dir: "src/interpreter2",
+    output_hpp_dir: "include/xo/interpreter2",
+    output_impl_subdir: "detail",
     includes: [ "<xo/printable2/Printable.hpp>",
                 "<xo/printable2/detail/IPrintable_Xfer.hpp>" ],
     local_types: [ ],
diff --git a/idl/IPrintable_DVsmApplyFrame.json5 b/idl/IPrintable_DVsmApplyFrame.json5
index c78e0b88..bef2fb62 100644
--- a/idl/IPrintable_DVsmApplyFrame.json5
+++ b/idl/IPrintable_DVsmApplyFrame.json5
@@ -1,6 +1,8 @@
 {
     mode: "implementation",
     output_cpp_dir: "src/interpreter2",
+    output_hpp_dir: "include/xo/interpreter2",
+    output_impl_subdir: "detail",
     includes: [ "<xo/printable2/Printable.hpp>",
                 "<xo/printable2/detail/IPrintable_Xfer.hpp>" ],
     local_types: [ ],
diff --git a/idl/IPrintable_DVsmEvalArgsFrame.json5 b/idl/IPrintable_DVsmEvalArgsFrame.json5
index 1dd1672a..c43c5160 100644
--- a/idl/IPrintable_DVsmEvalArgsFrame.json5
+++ b/idl/IPrintable_DVsmEvalArgsFrame.json5
@@ -1,6 +1,8 @@
 {
     mode: "implementation",
     output_cpp_dir: "src/interpreter2",
+    output_hpp_dir: "include/xo/interpreter2",
+    output_impl_subdir: "detail",
     includes: [ "<xo/printable2/Printable.hpp>",
                 "<xo/printable2/detail/IPrintable_Xfer.hpp>" ],
     local_types: [ ],
diff --git a/idl/IPrintable_DVsmIfElseContFrame.json5 b/idl/IPrintable_DVsmIfElseContFrame.json5
index b9f70e6d..6490d444 100644
--- a/idl/IPrintable_DVsmIfElseContFrame.json5
+++ b/idl/IPrintable_DVsmIfElseContFrame.json5
@@ -1,6 +1,8 @@
 {
     mode: "implementation",
     output_cpp_dir: "src/interpreter2",
+    output_hpp_dir: "include/xo/interpreter2",
+    output_impl_subdir: "ifelse",
     includes: [ "<xo/printable2/Printable.hpp>",
                 "<xo/printable2/detail/IPrintable_Xfer.hpp>" ],
     local_types: [ ],
diff --git a/idl/IPrintable_DVsmSeqContFrame.json5 b/idl/IPrintable_DVsmSeqContFrame.json5
index 96b9c071..7b8e7ddd 100644
--- a/idl/IPrintable_DVsmSeqContFrame.json5
+++ b/idl/IPrintable_DVsmSeqContFrame.json5
@@ -1,6 +1,8 @@
 {
     mode: "implementation",
     output_cpp_dir: "src/interpreter2",
+    output_hpp_dir: "include/xo/interpreter2",
+    output_impl_subdir: "sequence",
     includes: [ "<xo/printable2/Printable.hpp>",
                 "<xo/printable2/detail/IPrintable_Xfer.hpp>" ],
     local_types: [ ],
diff --git a/idl/IProcedure_DClosure.json5 b/idl/IProcedure_DClosure.json5
index d503f5c6..eec40c0c 100644
--- a/idl/IProcedure_DClosure.json5
+++ b/idl/IProcedure_DClosure.json5
@@ -1,5 +1,7 @@
 {
     mode: "implementation",
+    output_hpp_dir: "include/xo/interpreter2",
+    output_impl_subdir: "detail",
     includes: [
         "<xo/procedure2/RuntimeContext.hpp>",
         "<xo/procedure2/detail/IRuntimeContext_Xfer.hpp>",
diff --git a/idl/IRuntimeContext_DVsmRcx.json5 b/idl/IRuntimeContext_DVsmRcx.json5
index 9fa3fe40..b52517ee 100644
--- a/idl/IRuntimeContext_DVsmRcx.json5
+++ b/idl/IRuntimeContext_DVsmRcx.json5
@@ -1,6 +1,8 @@
 {
     mode: "implementation",
     output_cpp_dir: "src/interpreter2",
+    output_hpp_dir: "include/xo/interpreter2",
+    output_impl_subdir: "detail",
     includes: [
         //"<xo/procedure2/RuntimeContext.hpp>",
         //"<xo/procedure2/detail/IRuntimeContext_Xfer.hpp>",