diff --git a/idl/IGCObject_DArray.json5 b/idl/IGCObject_DArray.json5
index 3e1115e..bef5bd6 100644
--- a/idl/IGCObject_DArray.json5
+++ b/idl/IGCObject_DArray.json5
@@ -1,6 +1,8 @@
 {
     mode: "implementation",
     output_cpp_dir: "src/object2",
+    output_hpp_dir: "include/xo/object2",
+    output_impl_subdir: "array",
     includes: [
         "<xo/gc/GCObject.hpp>",
         "<xo/alloc2/Allocator.hpp>"
diff --git a/idl/IGCObject_DBoolean.json5 b/idl/IGCObject_DBoolean.json5
index be131a3..c9aaf26 100644
--- a/idl/IGCObject_DBoolean.json5
+++ b/idl/IGCObject_DBoolean.json5
@@ -1,6 +1,8 @@
 {
     mode: "implementation",
     output_cpp_dir: "src/object2",
+    output_hpp_dir: "include/xo/object2",
+    output_impl_subdir: "boolean",
     includes: [
         "<xo/gc/GCObject.hpp>",
         "<xo/alloc2/Allocator.hpp>"
diff --git a/idl/IGCObject_DFloat.json5 b/idl/IGCObject_DFloat.json5
index 2791de0..eec1e3e 100644
--- a/idl/IGCObject_DFloat.json5
+++ b/idl/IGCObject_DFloat.json5
@@ -1,6 +1,8 @@
 {
     mode: "implementation",
     output_cpp_dir: "src/object2",
+    output_hpp_dir: "include/xo/object2",
+    output_impl_subdir: "number",
     includes: [
         "<xo/object2/number/GCObjectConversion_DFloat.hpp>",
         "<xo/gc/GCObject.hpp>",
diff --git a/idl/IGCObject_DInteger.json5 b/idl/IGCObject_DInteger.json5
index 6b865a4..37d603e 100644
--- a/idl/IGCObject_DInteger.json5
+++ b/idl/IGCObject_DInteger.json5
@@ -1,6 +1,8 @@
 {
     mode: "implementation",
     output_cpp_dir: "src/object2",
+    output_hpp_dir: "include/xo/object2",
+    output_impl_subdir: "number",
     includes: [
         "<xo/gc/GCObject.hpp>",
         "<xo/alloc2/Allocator.hpp>"
diff --git a/idl/IGCObject_DList.json5 b/idl/IGCObject_DList.json5
index e660b0c..28fb335 100644
--- a/idl/IGCObject_DList.json5
+++ b/idl/IGCObject_DList.json5
@@ -1,6 +1,8 @@
 {
     mode: "implementation",
     output_cpp_dir: "src/object2",
+    output_hpp_dir: "include/xo/object2",
+    output_impl_subdir: "list",
     includes: [
 //        "<xo/gc/GCObject.hpp>",
 //        "<xo/alloc2/Allocator.hpp>"
diff --git a/idl/IGCObject_DRuntimeError.json5 b/idl/IGCObject_DRuntimeError.json5
index 60d30cc..cfcbe9f 100644
--- a/idl/IGCObject_DRuntimeError.json5
+++ b/idl/IGCObject_DRuntimeError.json5
@@ -1,6 +1,8 @@
 {
     mode: "implementation",
     output_cpp_dir: "src/object2",
+    output_hpp_dir: "include/xo/object2",
+    output_impl_subdir: "error",
     includes: [
 //        "<xo/gc/GCObject.hpp>",
 //        "<xo/alloc2/Allocator.hpp>"
diff --git a/idl/IGCObject_DString.json5 b/idl/IGCObject_DString.json5
index 60c2165..caf33fa 100644
--- a/idl/IGCObject_DString.json5
+++ b/idl/IGCObject_DString.json5
@@ -1,6 +1,8 @@
 {
     mode: "implementation",
     output_cpp_dir: "src/object2",
+    output_hpp_dir: "include/xo/object2",
+    output_impl_subdir: "string",
     includes: [
         "<xo/gc/GCObject.hpp>",
         "<xo/alloc2/Allocator.hpp>"
diff --git a/idl/IPrintable_DArray.json5 b/idl/IPrintable_DArray.json5
index eee19b5..b9bde4f 100644
--- a/idl/IPrintable_DArray.json5
+++ b/idl/IPrintable_DArray.json5
@@ -1,6 +1,8 @@
 {
     mode: "implementation",
     output_cpp_dir: "src/object2",
+    output_hpp_dir: "include/xo/object2",
+    output_impl_subdir: "array",
     includes: [ "<xo/printable2/Printable.hpp>",
                 "<xo/printable2/detail/IPrintable_Xfer.hpp>" ],
     local_types: [ ],
diff --git a/idl/IPrintable_DBoolean.json5 b/idl/IPrintable_DBoolean.json5
index 0924536..db94925 100644
--- a/idl/IPrintable_DBoolean.json5
+++ b/idl/IPrintable_DBoolean.json5
@@ -1,6 +1,8 @@
 {
     mode: "implementation",
     output_cpp_dir: "src/object2",
+    output_hpp_dir: "include/xo/object2",
+    output_impl_subdir: "boolean",
     includes: [ "<xo/printable2/Printable.hpp>",
                 "<xo/printable2/detail/IPrintable_Xfer.hpp>" ],
     local_types: [ ],
diff --git a/idl/IPrintable_DFloat.json5 b/idl/IPrintable_DFloat.json5
index 427c5dc..d28680f 100644
--- a/idl/IPrintable_DFloat.json5
+++ b/idl/IPrintable_DFloat.json5
@@ -1,6 +1,8 @@
 {
     mode: "implementation",
     output_cpp_dir: "src/object2",
+    output_hpp_dir: "include/xo/object2",
+    output_impl_subdir: "number",
     includes: [ "<xo/printable2/Printable.hpp>",
                 "<xo/printable2/detail/IPrintable_Xfer.hpp>" ],
     local_types: [ ],
diff --git a/idl/IPrintable_DInteger.json5 b/idl/IPrintable_DInteger.json5
index 92c7437..478da57 100644
--- a/idl/IPrintable_DInteger.json5
+++ b/idl/IPrintable_DInteger.json5
@@ -1,6 +1,8 @@
 {
     mode: "implementation",
     output_cpp_dir: "src/object2",
+    output_hpp_dir: "include/xo/object2",
+    output_impl_subdir: "number",
     includes: [ "<xo/printable2/Printable.hpp>",
                 "<xo/printable2/detail/IPrintable_Xfer.hpp>" ],
     local_types: [ ],
diff --git a/idl/IPrintable_DList.json5 b/idl/IPrintable_DList.json5
index 58b8ea8..a7a6bfb 100644
--- a/idl/IPrintable_DList.json5
+++ b/idl/IPrintable_DList.json5
@@ -1,6 +1,8 @@
 {
     mode: "implementation",
     output_cpp_dir: "src/object2",
+    output_hpp_dir: "include/xo/object2",
+    output_impl_subdir: "list",
     includes: [ "<xo/printable2/Printable.hpp>",
                 "<xo/printable2/detail/IPrintable_Xfer.hpp>" ],
     local_types: [ ],
diff --git a/idl/IPrintable_DRuntimeError.json5 b/idl/IPrintable_DRuntimeError.json5
index b9e291e..a840492 100644
--- a/idl/IPrintable_DRuntimeError.json5
+++ b/idl/IPrintable_DRuntimeError.json5
@@ -1,6 +1,8 @@
 {
     mode: "implementation",
     output_cpp_dir: "src/object2",
+    output_hpp_dir: "include/xo/object2",
+    output_impl_subdir: "error",
     includes: [ "<xo/printable2/Printable.hpp>",
                 "<xo/printable2/detail/IPrintable_Xfer.hpp>" ],
     local_types: [ ],
diff --git a/idl/IPrintable_DString.json5 b/idl/IPrintable_DString.json5
index 8caffaa..8510938 100644
--- a/idl/IPrintable_DString.json5
+++ b/idl/IPrintable_DString.json5
@@ -1,6 +1,8 @@
 {
     mode: "implementation",
     output_cpp_dir: "src/object2",
+    output_hpp_dir: "include/xo/object2",
+    output_impl_subdir: "string",
     includes: [ "<xo/printable2/Printable.hpp>",
                 "<xo/printable2/detail/IPrintable_Xfer.hpp>" ],
     local_types: [ ],
diff --git a/idl/ISequence_DArray.json5 b/idl/ISequence_DArray.json5
index 1f09b0b..265c379 100644
--- a/idl/ISequence_DArray.json5
+++ b/idl/ISequence_DArray.json5
@@ -1,6 +1,8 @@
 {
     mode: "implementation",
     output_cpp_dir: "src/object2",
+    output_hpp_dir: "include/xo/object2",
+    output_impl_subdir: "array",
     includes: [ ],
     local_types: [ ],
     namespace1: "xo",
diff --git a/idl/ISequence_DList.json5 b/idl/ISequence_DList.json5
index edf0e8d..2ff69f0 100644
--- a/idl/ISequence_DList.json5
+++ b/idl/ISequence_DList.json5
@@ -1,6 +1,8 @@
 {
     mode: "implementation",
     output_cpp_dir: "src/object2",
+    output_hpp_dir: "include/xo/object2",
+    output_impl_subdir: "list",
     includes: [ "<xo/printable2/Printable.hpp>" ],
     local_types: [ ],
     namespace1: "xo",
diff --git a/idl/Sequence.json5 b/idl/Sequence.json5
index 5c5139d..2027169 100644
--- a/idl/Sequence.json5
+++ b/idl/Sequence.json5
@@ -1,6 +1,8 @@
 {
     mode: "facet",
     output_cpp_dir: "src/object2",
+    output_hpp_dir: "include/xo/object2",
+    output_impl_subdir: "sequence",
     includes: ["<xo/gc/GCObject.hpp>"],
     // extra includes in Sequence.hpp, if any
     user_hpp_includes: [],