diff --git a/CMakeLists.txt b/CMakeLists.txt
index 15a6d32..de78c4f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,7 +39,6 @@ xo_add_genfacet(
 xo_add_genfacetimpl(
     TARGET xo-procedure2-facetimpl-runtimecontext-simplercx
     FACET_PKG xo_procedure2
-#    REPR DSimpleRcx
     INPUT idl/IRuntimeContext_DSimpleRcx.json5
     )
 
@@ -49,7 +48,6 @@ xo_add_genfacetimpl(
 xo_add_genfacetimpl(
     TARGET xo-procedure2-facetimpl-procedure-primitive_gco_0
     FACET_PKG xo_procedure2
-#    REPR DPrimitive_gco_0
     INPUT idl/IProcedure_DPrimitive_gco_0.json5
 )
 
@@ -57,7 +55,6 @@ xo_add_genfacetimpl(
 xo_add_genfacetimpl(
     TARGET xo-procedure2-facetimpl-gcobject-primitive_gco_0
     FACET_PKG xo_alloc2
-#    REPR Primitive_gco_0
     INPUT idl/IGCObject_DPrimitive_gco_0.json5
 )
 
@@ -65,7 +62,6 @@ xo_add_genfacetimpl(
 xo_add_genfacetimpl(
     TARGET xo-procedure2-facetimpl-printable-primitive_gco_0
     FACET_PKG xo_printable2
-#    REPR Primitive_gco_0
     INPUT idl/IPrintable_DPrimitive_gco_0.json5
 )
 
@@ -75,7 +71,6 @@ xo_add_genfacetimpl(
 xo_add_genfacetimpl(
     TARGET xo-procedure2-facetimpl-procedure-primitive_gco_1_gco
     FACET_PKG xo_procedure2
-#    REPR DPrimitive_gco_1_gco
     INPUT idl/IProcedure_DPrimitive_gco_1_gco.json5
 )
 
@@ -83,7 +78,6 @@ xo_add_genfacetimpl(
 xo_add_genfacetimpl(
     TARGET xo-procedure2-facetimpl-gcobject-primitive_gco_1_gco
     FACET_PKG xo_alloc2
-#    REPR Primitive_gco_1_gco
     INPUT idl/IGCObject_DPrimitive_gco_1_gco.json5
 )
 
@@ -91,7 +85,6 @@ xo_add_genfacetimpl(
 xo_add_genfacetimpl(
     TARGET xo-procedure2-facetimpl-printable-primitive_gco_1_gco
     FACET_PKG xo_printable2
-#    REPR Primitive_gco_1_gco
     INPUT idl/IPrintable_DPrimitive_gco_1_gco.json5
 )
 
@@ -101,7 +94,6 @@ xo_add_genfacetimpl(
 xo_add_genfacetimpl(
     TARGET xo-procedure2-facetimpl-procedure-primitive_gco_2_gco_gco
     FACET_PKG xo_procedure2
-#    REPR DPrimitive_gco_2_gco_gco
     INPUT idl/IProcedure_DPrimitive_gco_2_gco_gco.json5
 )
 
@@ -109,7 +101,6 @@ xo_add_genfacetimpl(
 xo_add_genfacetimpl(
     TARGET xo-procedure2-facetimpl-gcobject-primitive_gco_2_gco_gco
     FACET_PKG xo_alloc2
-#    REPR Primitive_gco_2_gco_gco
     INPUT idl/IGCObject_DPrimitive_gco_2_gco_gco.json5
 )
 
@@ -117,7 +108,6 @@ xo_add_genfacetimpl(
 xo_add_genfacetimpl(
     TARGET xo-procedure2-facetimpl-printable-primitive_gco_2_gco_gco
     FACET_PKG xo_printable2
-#    REPR Primitive_gco_2_gco_gco
     INPUT idl/IPrintable_DPrimitive_gco_2_gco_gco.json5
 )
 
@@ -127,7 +117,6 @@ xo_add_genfacetimpl(
 xo_add_genfacetimpl(
     TARGET xo-procedure2-facetimpl-procedure-primitive_gco_3_dict_string_gco
     FACET_PKG xo_procedure2
-#    REPR Dprimitive_gco_3_dict_string_gco
     INPUT idl/IProcedure_DPrimitive_gco_3_dict_string_gco.json5
 )
 
@@ -135,7 +124,6 @@ xo_add_genfacetimpl(
 xo_add_genfacetimpl(
     TARGET xo-procedure2-facetimpl-gcobject-primitive_gco_3_dict_string_gco
     FACET_PKG xo_alloc2
-#    REPR primitive_gco_3_dict_string_gco
     INPUT idl/IGCObject_DPrimitive_gco_3_dict_string_gco.json5
 )
 
@@ -143,7 +131,6 @@ xo_add_genfacetimpl(
 xo_add_genfacetimpl(
     TARGET xo-procedure2-facetimpl-printable-primitive_gco_3_dict_string_gco
     FACET_PKG xo_printable2
-#    REPR primitive_gco_3_dict_string_gco
     INPUT idl/IPrintable_DPrimitive_gco_3_dict_string_gco.json5
 )
 
diff --git a/idl/IGCObject_DPrimitive_gco_0.json5 b/idl/IGCObject_DPrimitive_gco_0.json5
index 89c7de3..e101b65 100644
--- a/idl/IGCObject_DPrimitive_gco_0.json5
+++ b/idl/IGCObject_DPrimitive_gco_0.json5
@@ -1,6 +1,6 @@
 {
     mode: "implementation",
-    output_cpp_dir: "src/procedure2",
+    output_cpp_dir: "src/procedure2/facet",
     output_hpp_dir: "include/xo/procedure2",
     output_impl_subdir: "detail",
     includes: [
diff --git a/idl/IGCObject_DPrimitive_gco_1_gco.json5 b/idl/IGCObject_DPrimitive_gco_1_gco.json5
index 60785f6..68a74f6 100644
--- a/idl/IGCObject_DPrimitive_gco_1_gco.json5
+++ b/idl/IGCObject_DPrimitive_gco_1_gco.json5
@@ -1,6 +1,6 @@
 {
     mode: "implementation",
-    output_cpp_dir: "src/procedure2",
+    output_cpp_dir: "src/procedure2/facet",
     output_hpp_dir: "include/xo/procedure2",
     output_impl_subdir: "detail",
     includes: [
diff --git a/idl/IGCObject_DPrimitive_gco_2_gco_gco.json5 b/idl/IGCObject_DPrimitive_gco_2_gco_gco.json5
index e0ffb9f..e012bd8 100644
--- a/idl/IGCObject_DPrimitive_gco_2_gco_gco.json5
+++ b/idl/IGCObject_DPrimitive_gco_2_gco_gco.json5
@@ -1,6 +1,6 @@
 {
     mode: "implementation",
-    output_cpp_dir: "src/procedure2",
+    output_cpp_dir: "src/procedure2/facet",
     output_hpp_dir: "include/xo/procedure2",
     output_impl_subdir: "detail",
     includes: [
diff --git a/idl/IGCObject_DPrimitive_gco_3_dict_string_gco.json5 b/idl/IGCObject_DPrimitive_gco_3_dict_string_gco.json5
index ad44b58..7c61aea 100644
--- a/idl/IGCObject_DPrimitive_gco_3_dict_string_gco.json5
+++ b/idl/IGCObject_DPrimitive_gco_3_dict_string_gco.json5
@@ -1,6 +1,6 @@
 {
     mode: "implementation",
-    output_cpp_dir: "src/procedure2",
+    output_cpp_dir: "src/procedure2/facet",
     output_hpp_dir: "include/xo/procedure2",
     output_impl_subdir: "detail",
     includes: [
diff --git a/idl/IPrintable_DPrimitive_gco_0.json5 b/idl/IPrintable_DPrimitive_gco_0.json5
index 830078c..7b88b4e 100644
--- a/idl/IPrintable_DPrimitive_gco_0.json5
+++ b/idl/IPrintable_DPrimitive_gco_0.json5
@@ -1,6 +1,6 @@
 {
     mode: "implementation",
-    output_cpp_dir: "src/procedure2",
+    output_cpp_dir: "src/procedure2/facet",
     output_hpp_dir: "include/xo/procedure2",
     output_impl_subdir: "detail",
     includes: [
diff --git a/idl/IPrintable_DPrimitive_gco_1_gco.json5 b/idl/IPrintable_DPrimitive_gco_1_gco.json5
index 9678243..4449356 100644
--- a/idl/IPrintable_DPrimitive_gco_1_gco.json5
+++ b/idl/IPrintable_DPrimitive_gco_1_gco.json5
@@ -1,6 +1,6 @@
 {
     mode: "implementation",
-    output_cpp_dir: "src/procedure2",
+    output_cpp_dir: "src/procedure2/facet",
     output_hpp_dir: "include/xo/procedure2",
     output_impl_subdir: "detail",
     includes: [
diff --git a/idl/IPrintable_DPrimitive_gco_2_gco_gco.json5 b/idl/IPrintable_DPrimitive_gco_2_gco_gco.json5
index ee3a195..7b75e0b 100644
--- a/idl/IPrintable_DPrimitive_gco_2_gco_gco.json5
+++ b/idl/IPrintable_DPrimitive_gco_2_gco_gco.json5
@@ -1,15 +1,11 @@
 {
     mode: "implementation",
-    output_cpp_dir: "src/procedure2",
+    output_cpp_dir: "src/procedure2/facet",
     output_hpp_dir: "include/xo/procedure2",
     output_impl_subdir: "detail",
     includes: [
         "<xo/printable2/Printable.hpp>",
         "<xo/printable2/detail/IPrintable_Xfer.hpp>",
-//        "<xo/procedure2/RuntimeContext.hpp>",
-//        "<xo/procedure2/detail/IRuntimeContext_Xfer.hpp>",
-//        "<xo/procedure2/Procedure.hpp>",
-//        "<xo/procedure2/detail/IProcedure_Xfer.hpp>",
     ],
     local_types: [ ],
     namespace1: "xo",
diff --git a/idl/IPrintable_DPrimitive_gco_3_dict_string_gco.json5 b/idl/IPrintable_DPrimitive_gco_3_dict_string_gco.json5
index c312945..639402c 100644
--- a/idl/IPrintable_DPrimitive_gco_3_dict_string_gco.json5
+++ b/idl/IPrintable_DPrimitive_gco_3_dict_string_gco.json5
@@ -1,6 +1,6 @@
 {
     mode: "implementation",
-    output_cpp_dir: "src/procedure2",
+    output_cpp_dir: "src/procedure2/facet",
     output_hpp_dir: "include/xo/procedure2",
     output_impl_subdir: "detail",
     includes: [
diff --git a/idl/IProcedure_DPrimitive_gco_0.json5 b/idl/IProcedure_DPrimitive_gco_0.json5
index 757e5f5..4b0600f 100644
--- a/idl/IProcedure_DPrimitive_gco_0.json5
+++ b/idl/IProcedure_DPrimitive_gco_0.json5
@@ -1,6 +1,6 @@
 {
     mode: "implementation",
-    output_cpp_dir: "src/procedure2",
+    output_cpp_dir: "src/procedure2/facet",
     output_hpp_dir: "include/xo/procedure2",
     output_impl_subdir: "detail",
     includes: [
diff --git a/idl/IProcedure_DPrimitive_gco_1_gco.json5 b/idl/IProcedure_DPrimitive_gco_1_gco.json5
index 63af21b..5500732 100644
--- a/idl/IProcedure_DPrimitive_gco_1_gco.json5
+++ b/idl/IProcedure_DPrimitive_gco_1_gco.json5
@@ -1,6 +1,6 @@
 {
     mode: "implementation",
-    output_cpp_dir: "src/procedure2",
+    output_cpp_dir: "src/procedure2/facet",
     output_hpp_dir: "include/xo/procedure2",
     output_impl_subdir: "detail",
     includes: [
diff --git a/idl/IProcedure_DPrimitive_gco_2_gco_gco.json5 b/idl/IProcedure_DPrimitive_gco_2_gco_gco.json5
index b50a863..e74b53c 100644
--- a/idl/IProcedure_DPrimitive_gco_2_gco_gco.json5
+++ b/idl/IProcedure_DPrimitive_gco_2_gco_gco.json5
@@ -1,6 +1,6 @@
 {
     mode: "implementation",
-    output_cpp_dir: "src/procedure2",
+    output_cpp_dir: "src/procedure2/facet",
     output_hpp_dir: "include/xo/procedure2",
     output_impl_subdir: "detail",
     includes: [
diff --git a/idl/IProcedure_DPrimitive_gco_3_dict_string_gco.json5 b/idl/IProcedure_DPrimitive_gco_3_dict_string_gco.json5
index 8099d9f..ffb820d 100644
--- a/idl/IProcedure_DPrimitive_gco_3_dict_string_gco.json5
+++ b/idl/IProcedure_DPrimitive_gco_3_dict_string_gco.json5
@@ -1,6 +1,6 @@
 {
     mode: "implementation",
-    output_cpp_dir: "src/procedure2",
+    output_cpp_dir: "src/procedure2/facet",
     output_hpp_dir: "include/xo/procedure2",
     output_impl_subdir: "detail",
     includes: [
diff --git a/idl/IRuntimeContext_DSimpleRcx.json5 b/idl/IRuntimeContext_DSimpleRcx.json5
index 324526f..ea42239 100644
--- a/idl/IRuntimeContext_DSimpleRcx.json5
+++ b/idl/IRuntimeContext_DSimpleRcx.json5
@@ -1,6 +1,6 @@
 {
     mode: "implementation",
-    output_cpp_dir: "src/procedure2",
+    output_cpp_dir: "src/procedure2/facet",
     output_hpp_dir: "include/xo/procedure2",
     output_impl_subdir: "detail",
     includes: [
diff --git a/idl/Procedure.json5 b/idl/Procedure.json5
index a4597dd..e73c6d8 100644
--- a/idl/Procedure.json5
+++ b/idl/Procedure.json5
@@ -4,7 +4,7 @@
 
 {
     mode: "facet",
-    output_cpp_dir: "src/procedure2",
+    output_cpp_dir: "src/procedure2/facet",
     output_hpp_dir: "include/xo/procedure2",
     output_impl_subdir: "detail",
     // includes in ASyntaxStateMachine.hpp
diff --git a/idl/RuntimeContext.json5 b/idl/RuntimeContext.json5
index 4012077..46623b4 100644
--- a/idl/RuntimeContext.json5
+++ b/idl/RuntimeContext.json5
@@ -1,6 +1,6 @@
 {
     mode: "facet",
-    output_cpp_dir: "src/procedure2",
+    output_cpp_dir: "src/procedure2/facet",
     output_hpp_dir: "include/xo/procedure2",
     output_impl_subdir: "detail",
     // includes in ARuntimeContext.hpp
diff --git a/src/procedure2/CMakeLists.txt b/src/procedure2/CMakeLists.txt
index c10c878..9e1af2c 100644
--- a/src/procedure2/CMakeLists.txt
+++ b/src/procedure2/CMakeLists.txt
@@ -7,23 +7,23 @@ set(SELF_SRCS
     procedure2_register_types.cpp
     procedure2_register_facets.cpp
     PrimitiveRegistry.cpp
-    DSimpleRcx.cpp
-    IRuntimeContext_Any.cpp
-    IRuntimeContext_DSimpleRcx.cpp
-    IProcedure_Any.cpp
     DPrimitive.cpp
-    IGCObject_DPrimitive_gco_0.cpp
-    IProcedure_DPrimitive_gco_0.cpp
-    IPrintable_DPrimitive_gco_0.cpp
-    IGCObject_DPrimitive_gco_1_gco.cpp
-    IProcedure_DPrimitive_gco_1_gco.cpp
-    IPrintable_DPrimitive_gco_1_gco.cpp
-    IGCObject_DPrimitive_gco_2_gco_gco.cpp
-    IProcedure_DPrimitive_gco_2_gco_gco.cpp
-    IPrintable_DPrimitive_gco_2_gco_gco.cpp
-    IGCObject_DPrimitive_gco_3_dict_string_gco.cpp
-    IProcedure_DPrimitive_gco_3_dict_string_gco.cpp
-    IPrintable_DPrimitive_gco_3_dict_string_gco.cpp
+    DSimpleRcx.cpp
+    facet/IRuntimeContext_Any.cpp
+    facet/IRuntimeContext_DSimpleRcx.cpp
+    facet/IProcedure_Any.cpp
+    facet/IGCObject_DPrimitive_gco_0.cpp
+    facet/IProcedure_DPrimitive_gco_0.cpp
+    facet/IPrintable_DPrimitive_gco_0.cpp
+    facet/IGCObject_DPrimitive_gco_1_gco.cpp
+    facet/IProcedure_DPrimitive_gco_1_gco.cpp
+    facet/IPrintable_DPrimitive_gco_1_gco.cpp
+    facet/IGCObject_DPrimitive_gco_2_gco_gco.cpp
+    facet/IProcedure_DPrimitive_gco_2_gco_gco.cpp
+    facet/IPrintable_DPrimitive_gco_2_gco_gco.cpp
+    facet/IGCObject_DPrimitive_gco_3_dict_string_gco.cpp
+    facet/IProcedure_DPrimitive_gco_3_dict_string_gco.cpp
+    facet/IPrintable_DPrimitive_gco_3_dict_string_gco.cpp
 )
 
 xo_add_shared_library4(${SELF_LIB} ${PROJECT_NAME}Targets ${PROJECT_VERSION} 1 ${SELF_SRCS})
diff --git a/src/procedure2/IGCObject_DPrimitive_gco_0.cpp b/src/procedure2/facet/IGCObject_DPrimitive_gco_0.cpp
similarity index 100%
rename from src/procedure2/IGCObject_DPrimitive_gco_0.cpp
rename to src/procedure2/facet/IGCObject_DPrimitive_gco_0.cpp
diff --git a/src/procedure2/IGCObject_DPrimitive_gco_1_gco.cpp b/src/procedure2/facet/IGCObject_DPrimitive_gco_1_gco.cpp
similarity index 100%
rename from src/procedure2/IGCObject_DPrimitive_gco_1_gco.cpp
rename to src/procedure2/facet/IGCObject_DPrimitive_gco_1_gco.cpp
diff --git a/src/procedure2/IGCObject_DPrimitive_gco_2_gco_gco.cpp b/src/procedure2/facet/IGCObject_DPrimitive_gco_2_gco_gco.cpp
similarity index 100%
rename from src/procedure2/IGCObject_DPrimitive_gco_2_gco_gco.cpp
rename to src/procedure2/facet/IGCObject_DPrimitive_gco_2_gco_gco.cpp
diff --git a/src/procedure2/IGCObject_DPrimitive_gco_3_dict_string_gco.cpp b/src/procedure2/facet/IGCObject_DPrimitive_gco_3_dict_string_gco.cpp
similarity index 100%
rename from src/procedure2/IGCObject_DPrimitive_gco_3_dict_string_gco.cpp
rename to src/procedure2/facet/IGCObject_DPrimitive_gco_3_dict_string_gco.cpp
diff --git a/src/procedure2/IPrintable_DPrimitive_gco_0.cpp b/src/procedure2/facet/IPrintable_DPrimitive_gco_0.cpp
similarity index 100%
rename from src/procedure2/IPrintable_DPrimitive_gco_0.cpp
rename to src/procedure2/facet/IPrintable_DPrimitive_gco_0.cpp
diff --git a/src/procedure2/IPrintable_DPrimitive_gco_1_gco.cpp b/src/procedure2/facet/IPrintable_DPrimitive_gco_1_gco.cpp
similarity index 100%
rename from src/procedure2/IPrintable_DPrimitive_gco_1_gco.cpp
rename to src/procedure2/facet/IPrintable_DPrimitive_gco_1_gco.cpp
diff --git a/src/procedure2/IPrintable_DPrimitive_gco_2_gco_gco.cpp b/src/procedure2/facet/IPrintable_DPrimitive_gco_2_gco_gco.cpp
similarity index 100%
rename from src/procedure2/IPrintable_DPrimitive_gco_2_gco_gco.cpp
rename to src/procedure2/facet/IPrintable_DPrimitive_gco_2_gco_gco.cpp
diff --git a/src/procedure2/IPrintable_DPrimitive_gco_3_dict_string_gco.cpp b/src/procedure2/facet/IPrintable_DPrimitive_gco_3_dict_string_gco.cpp
similarity index 100%
rename from src/procedure2/IPrintable_DPrimitive_gco_3_dict_string_gco.cpp
rename to src/procedure2/facet/IPrintable_DPrimitive_gco_3_dict_string_gco.cpp
diff --git a/src/procedure2/IProcedure_Any.cpp b/src/procedure2/facet/IProcedure_Any.cpp
similarity index 100%
rename from src/procedure2/IProcedure_Any.cpp
rename to src/procedure2/facet/IProcedure_Any.cpp
diff --git a/src/procedure2/IProcedure_DPrimitive_gco_0.cpp b/src/procedure2/facet/IProcedure_DPrimitive_gco_0.cpp
similarity index 100%
rename from src/procedure2/IProcedure_DPrimitive_gco_0.cpp
rename to src/procedure2/facet/IProcedure_DPrimitive_gco_0.cpp
diff --git a/src/procedure2/IProcedure_DPrimitive_gco_1_gco.cpp b/src/procedure2/facet/IProcedure_DPrimitive_gco_1_gco.cpp
similarity index 100%
rename from src/procedure2/IProcedure_DPrimitive_gco_1_gco.cpp
rename to src/procedure2/facet/IProcedure_DPrimitive_gco_1_gco.cpp
diff --git a/src/procedure2/IProcedure_DPrimitive_gco_2_gco_gco.cpp b/src/procedure2/facet/IProcedure_DPrimitive_gco_2_gco_gco.cpp
similarity index 100%
rename from src/procedure2/IProcedure_DPrimitive_gco_2_gco_gco.cpp
rename to src/procedure2/facet/IProcedure_DPrimitive_gco_2_gco_gco.cpp
diff --git a/src/procedure2/IProcedure_DPrimitive_gco_3_dict_string_gco.cpp b/src/procedure2/facet/IProcedure_DPrimitive_gco_3_dict_string_gco.cpp
similarity index 100%
rename from src/procedure2/IProcedure_DPrimitive_gco_3_dict_string_gco.cpp
rename to src/procedure2/facet/IProcedure_DPrimitive_gco_3_dict_string_gco.cpp
diff --git a/src/procedure2/IRuntimeContext_Any.cpp b/src/procedure2/facet/IRuntimeContext_Any.cpp
similarity index 100%
rename from src/procedure2/IRuntimeContext_Any.cpp
rename to src/procedure2/facet/IRuntimeContext_Any.cpp
diff --git a/src/procedure2/IRuntimeContext_DSimpleRcx.cpp b/src/procedure2/facet/IRuntimeContext_DSimpleRcx.cpp
similarity index 100%
rename from src/procedure2/IRuntimeContext_DSimpleRcx.cpp
rename to src/procedure2/facet/IRuntimeContext_DSimpleRcx.cpp