diff --git a/CMakeLists.txt b/CMakeLists.txt
index 426e4112..32db85f2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,9 +29,9 @@ add_subdirectory(utest)
 # note: manual target; generated code committed to git
 xo_add_genfacetimpl(
     TARGET xo-interpreter2-facetimpl-gcobject-vsmdefcontframe
-    FACET_PKG xo_gc
+    FACET_PKG xo_alloc2
     FACET GCObject
-    REPR VsmDefContFrame
+#    REPR VsmDefContFrame
     INPUT idl/IGCObject_DVsmDefContFrame.json5
 )
 
@@ -40,7 +40,7 @@ xo_add_genfacetimpl(
     TARGET xo-interpreter2-facetimpl-printable-vsmdefcontframe
     FACET_PKG xo_printable2
     FACET Printable
-    REPR VsmDefContFrame
+#    REPR VsmDefContFrame
     INPUT idl/IPrintable_DVsmDefContFrame.json5
 )
 
@@ -49,9 +49,9 @@ xo_add_genfacetimpl(
 # note: manual target; generated code committed to git
 xo_add_genfacetimpl(
     TARGET xo-interpreter2-facetimpl-gcobject-vsmapplyframe
-    FACET_PKG xo_gc
+    FACET_PKG xo_alloc2
     FACET GCObject
-    REPR VsmApplyFrame
+#    REPR VsmApplyFrame
     INPUT idl/IGCObject_DVsmApplyFrame.json5
 )
 
@@ -60,7 +60,7 @@ xo_add_genfacetimpl(
     TARGET xo-interpreter2-facetimpl-printable-vsmapplyframe
     FACET_PKG xo_printable2
     FACET Printable
-    REPR VsmApplyFrame
+#    REPR VsmApplyFrame
     INPUT idl/IPrintable_DVsmApplyFrame.json5
 )
 
@@ -69,9 +69,9 @@ xo_add_genfacetimpl(
 # note: manual target; generated code committed to git
 xo_add_genfacetimpl(
     TARGET xo-interpreter2-facetimpl-gcobject-vsmevalargsframe
-    FACET_PKG xo_gc
+    FACET_PKG xo_alloc2
     FACET GCObject
-    REPR VsmEvalArgsFrame
+#    REPR VsmEvalArgsFrame
     INPUT idl/IGCObject_DVsmEvalArgsFrame.json5
 )
 
@@ -80,7 +80,7 @@ xo_add_genfacetimpl(
     TARGET xo-interpreter2-facetimpl-printable-vsmevalargsframe
     FACET_PKG xo_printable2
     FACET Printable
-    REPR DVsmEvalArgsFrame
+#    REPR DVsmEvalArgsFrame
     INPUT idl/IPrintable_DVsmEvalArgsFrame.json5
 )
 
@@ -89,9 +89,9 @@ xo_add_genfacetimpl(
 # note: manual target; generated code committed to git
 xo_add_genfacetimpl(
     TARGET xo-interpreter2-facetimpl-gcobject-vsmapplyclosureframe
-    FACET_PKG xo_gc
+    FACET_PKG xo_alloc2
     FACET GCObject
-    REPR VsmApplyClosureFrame
+#    REPR VsmApplyClosureFrame
     INPUT idl/IGCObject_DVsmApplyClosureFrame.json5
 )
 
@@ -100,7 +100,7 @@ xo_add_genfacetimpl(
     TARGET xo-interpreter2-facetimpl-printable-vsmapplyclosureframe
     FACET_PKG xo_printable2
     FACET Printable
-    REPR DVsmApplyClosureFrame
+#    REPR DVsmApplyClosureFrame
     INPUT idl/IPrintable_DVsmApplyClosureFrame.json5
 )
 
@@ -109,9 +109,9 @@ xo_add_genfacetimpl(
 # note: manual target; generated code committed to git
 xo_add_genfacetimpl(
     TARGET xo-interpreter2-facetimpl-gcobject-vsmifelsecontframe
-    FACET_PKG xo_gc
+    FACET_PKG xo_alloc2
     FACET GCObject
-    REPR VsmIfElseContFrame
+#    REPR VsmIfElseContFrame
     INPUT idl/IGCObject_DVsmIfElseContFrame.json5
 )
 
@@ -120,7 +120,7 @@ xo_add_genfacetimpl(
     TARGET xo-interpreter2-facetimpl-printable-vsmifelsecontframe
     FACET_PKG xo_printable2
     FACET Printable
-    REPR VsmIfElseContFrame
+#    REPR VsmIfElseContFrame
     INPUT idl/IPrintable_DVsmIfElseContFrame.json5
 )
 
@@ -129,9 +129,9 @@ xo_add_genfacetimpl(
 # note: manual target; generated code committed to git
 xo_add_genfacetimpl(
     TARGET xo-interpreter2-facetimpl-gcobject-vsmseqcontframe
-    FACET_PKG xo_gc
+    FACET_PKG xo_alloc2
     FACET GCObject
-    REPR VsmSeqContFrame
+#    REPR VsmSeqContFrame
     INPUT idl/IGCObject_DVsmSeqContFrame.json5
 )
 
@@ -140,7 +140,7 @@ xo_add_genfacetimpl(
     TARGET xo-interpreter2-facetimpl-printable-vsmseqcontframe
     FACET_PKG xo_printable2
     FACET Printable
-    REPR DVsmSeqContFrame
+#    REPR DVsmSeqContFrame
     INPUT idl/IPrintable_DVsmSeqContFrame.json5
 )
 
@@ -159,9 +159,9 @@ xo_add_genfacetimpl(
 # note: manual target; generated code committed to git
 xo_add_genfacetimpl(
     TARGET xo-interpreter2-facetimpl-gcobject-closure
-    FACET_PKG xo_gc
+    FACET_PKG xo_alloc2
     FACET GCObject
-    REPR Closure
+#    REPR Closure
     INPUT idl/IGCObject_DClosure.json5
 )
 
@@ -170,7 +170,7 @@ xo_add_genfacetimpl(
     TARGET xo-interpreter2-facetimpl-printable-closure
     FACET_PKG xo_printable2
     FACET Printable
-    REPR Closure
+#    REPR Closure
     INPUT idl/IPrintable_DClosure.json5
 )
 
@@ -179,9 +179,9 @@ xo_add_genfacetimpl(
 # note: manual target; generated code committed to git
 xo_add_genfacetimpl(
     TARGET xo-interpreter2-facetimpl-gcobject-globalenv
-    FACET_PKG xo_gc
+    FACET_PKG xo_alloc2
     FACET GCObject
-    REPR GlobalEnv
+#    REPR GlobalEnv
     INPUT idl/IGCObject_DGlobalEnv.json5
 )
 
@@ -190,7 +190,7 @@ xo_add_genfacetimpl(
     TARGET xo-interpreter2-facetimpl-printable-globalenv
     FACET_PKG xo_printable2
     FACET Printable
-    REPR GlobalEnv
+#    REPR GlobalEnv
     INPUT idl/IPrintable_DGlobalEnv.json5
 )
 
@@ -199,9 +199,9 @@ xo_add_genfacetimpl(
 # note: manual target; generated code committed to git
 xo_add_genfacetimpl(
     TARGET xo-interpreter2-facetimpl-gcobject-localenv
-    FACET_PKG xo_gc
+    FACET_PKG xo_alloc2
     FACET GCObject
-    REPR LocalEnv
+#    REPR LocalEnv
     INPUT idl/IGCObject_DLocalEnv.json5
 )
 
@@ -210,7 +210,7 @@ xo_add_genfacetimpl(
     TARGET xo-interpreter2-facetimpl-printable-localenv
     FACET_PKG xo_printable2
     FACET Printable
-    REPR LocalEnv
+#    REPR LocalEnv
     INPUT idl/IPrintable_DLocalEnv.json5
 )
 
@@ -220,7 +220,7 @@ xo_add_genfacetimpl(
     TARGET xo-interpreter2-facetimpl-runtimecontext-vsmrcx
     FACET_PKG xo_procedure2
     FACET RuntimeContext
-    REPR DVsmRcx
+#    REPR DVsmRcx
     INPUT idl/IRuntimeContext_DVsmRcx.json5
     )
 
diff --git a/include/xo/interpreter2/define/IGCObject_DVsmDefContFrame.hpp b/include/xo/interpreter2/define/IGCObject_DVsmDefContFrame.hpp
index bc3423d9..309a6ac7 100644
--- a/include/xo/interpreter2/define/IGCObject_DVsmDefContFrame.hpp
+++ b/include/xo/interpreter2/define/IGCObject_DVsmDefContFrame.hpp
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "GCObject.hpp"
-#include <xo/alloc2/GCObject.hpp>
+#include <xo/gc/GCObject.hpp>
 #include <xo/alloc2/Allocator.hpp>
 #include "DVsmDefContFrame.hpp"
 
@@ -64,4 +64,4 @@ namespace xo {
     } /*namespace scm*/
 } /*namespace xo*/
 
-/* end */
+/* end */
\ No newline at end of file
diff --git a/include/xo/interpreter2/detail/IGCObject_DClosure.hpp b/include/xo/interpreter2/detail/IGCObject_DClosure.hpp
index 8507d640..fb863205 100644
--- a/include/xo/interpreter2/detail/IGCObject_DClosure.hpp
+++ b/include/xo/interpreter2/detail/IGCObject_DClosure.hpp
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "GCObject.hpp"
-#include <xo/alloc2/GCObject.hpp>
+#include <xo/gc/GCObject.hpp>
 #include <xo/alloc2/Allocator.hpp>
 #include "DClosure.hpp"
 
@@ -64,4 +64,4 @@ namespace xo {
     } /*namespace scm*/
 } /*namespace xo*/
 
-/* end */
+/* end */
\ No newline at end of file
diff --git a/include/xo/interpreter2/detail/IGCObject_DVsmApplyClosureFrame.hpp b/include/xo/interpreter2/detail/IGCObject_DVsmApplyClosureFrame.hpp
index 7db673e7..2baacd05 100644
--- a/include/xo/interpreter2/detail/IGCObject_DVsmApplyClosureFrame.hpp
+++ b/include/xo/interpreter2/detail/IGCObject_DVsmApplyClosureFrame.hpp
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "GCObject.hpp"
-#include <xo/alloc2/GCObject.hpp>
+#include <xo/gc/GCObject.hpp>
 #include <xo/alloc2/Allocator.hpp>
 #include "DVsmApplyClosureFrame.hpp"
 
@@ -64,4 +64,4 @@ namespace xo {
     } /*namespace scm*/
 } /*namespace xo*/
 
-/* end */
+/* end */
\ No newline at end of file
diff --git a/include/xo/interpreter2/detail/IGCObject_DVsmApplyFrame.hpp b/include/xo/interpreter2/detail/IGCObject_DVsmApplyFrame.hpp
index 401a91d7..ca6d3b10 100644
--- a/include/xo/interpreter2/detail/IGCObject_DVsmApplyFrame.hpp
+++ b/include/xo/interpreter2/detail/IGCObject_DVsmApplyFrame.hpp
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "GCObject.hpp"
-#include <xo/alloc2/GCObject.hpp>
+#include <xo/gc/GCObject.hpp>
 #include <xo/alloc2/Allocator.hpp>
 #include "DVsmApplyFrame.hpp"
 
@@ -64,4 +64,4 @@ namespace xo {
     } /*namespace scm*/
 } /*namespace xo*/
 
-/* end */
+/* end */
\ No newline at end of file
diff --git a/include/xo/interpreter2/detail/IGCObject_DVsmEvalArgsFrame.hpp b/include/xo/interpreter2/detail/IGCObject_DVsmEvalArgsFrame.hpp
index 1a91c32f..4a8ad18a 100644
--- a/include/xo/interpreter2/detail/IGCObject_DVsmEvalArgsFrame.hpp
+++ b/include/xo/interpreter2/detail/IGCObject_DVsmEvalArgsFrame.hpp
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "GCObject.hpp"
-#include <xo/alloc2/GCObject.hpp>
+#include <xo/gc/GCObject.hpp>
 #include <xo/alloc2/Allocator.hpp>
 #include "DVsmEvalArgsFrame.hpp"
 
@@ -64,4 +64,4 @@ namespace xo {
     } /*namespace scm*/
 } /*namespace xo*/
 
-/* end */
+/* end */
\ No newline at end of file
diff --git a/include/xo/interpreter2/env/IGCObject_DGlobalEnv.hpp b/include/xo/interpreter2/env/IGCObject_DGlobalEnv.hpp
index 71ac3e49..1f0f9281 100644
--- a/include/xo/interpreter2/env/IGCObject_DGlobalEnv.hpp
+++ b/include/xo/interpreter2/env/IGCObject_DGlobalEnv.hpp
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "GCObject.hpp"
-#include <xo/alloc2/GCObject.hpp>
+#include <xo/gc/GCObject.hpp>
 #include <xo/alloc2/Allocator.hpp>
 #include "DGlobalEnv.hpp"
 
@@ -64,4 +64,4 @@ namespace xo {
     } /*namespace scm*/
 } /*namespace xo*/
 
-/* end */
+/* end */
\ No newline at end of file
diff --git a/include/xo/interpreter2/env/IGCObject_DLocalEnv.hpp b/include/xo/interpreter2/env/IGCObject_DLocalEnv.hpp
index 25db925a..d318bb61 100644
--- a/include/xo/interpreter2/env/IGCObject_DLocalEnv.hpp
+++ b/include/xo/interpreter2/env/IGCObject_DLocalEnv.hpp
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "GCObject.hpp"
-#include <xo/alloc2/GCObject.hpp>
+#include <xo/gc/GCObject.hpp>
 #include <xo/alloc2/Allocator.hpp>
 #include "DLocalEnv.hpp"
 
@@ -64,4 +64,4 @@ namespace xo {
     } /*namespace scm*/
 } /*namespace xo*/
 
-/* end */
+/* end */
\ No newline at end of file
diff --git a/include/xo/interpreter2/ifelse/IGCObject_DVsmIfElseContFrame.hpp b/include/xo/interpreter2/ifelse/IGCObject_DVsmIfElseContFrame.hpp
index 1d29a8ac..293dd70d 100644
--- a/include/xo/interpreter2/ifelse/IGCObject_DVsmIfElseContFrame.hpp
+++ b/include/xo/interpreter2/ifelse/IGCObject_DVsmIfElseContFrame.hpp
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "GCObject.hpp"
-#include <xo/alloc2/GCObject.hpp>
+#include <xo/gc/GCObject.hpp>
 #include <xo/alloc2/Allocator.hpp>
 #include "DVsmIfElseContFrame.hpp"
 
@@ -64,4 +64,4 @@ namespace xo {
     } /*namespace scm*/
 } /*namespace xo*/
 
-/* end */
+/* end */
\ No newline at end of file
diff --git a/include/xo/interpreter2/sequence/IGCObject_DVsmSeqContFrame.hpp b/include/xo/interpreter2/sequence/IGCObject_DVsmSeqContFrame.hpp
index 9b686c6c..1bdbe2ab 100644
--- a/include/xo/interpreter2/sequence/IGCObject_DVsmSeqContFrame.hpp
+++ b/include/xo/interpreter2/sequence/IGCObject_DVsmSeqContFrame.hpp
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "GCObject.hpp"
-#include <xo/alloc2/GCObject.hpp>
+#include <xo/gc/GCObject.hpp>
 #include <xo/alloc2/Allocator.hpp>
 #include "DVsmSeqContFrame.hpp"
 
@@ -64,4 +64,4 @@ namespace xo {
     } /*namespace scm*/
 } /*namespace xo*/
 
-/* end */
+/* end */
\ No newline at end of file