diff --git a/idl/IGCObject_DGlobalEnv.json5 b/idl/IGCObject_DGlobalEnv.json5
index 1a590527..c3d666dd 100644
--- a/idl/IGCObject_DGlobalEnv.json5
+++ b/idl/IGCObject_DGlobalEnv.json5
@@ -1,7 +1,7 @@
 {
     mode: "implementation",
     output_cpp_dir: "src/reader2/facet",
-    output_hpp_dir: "include/xo/interpreter2",
+    output_hpp_dir: "include/xo/reader2",
     output_impl_subdir: "env",
     includes: [
         "<xo/alloc2/GCObject.hpp>",
diff --git a/idl/IPrintable_DGlobalEnv.json5 b/idl/IPrintable_DGlobalEnv.json5
index 0a05eb62..9e48847e 100644
--- a/idl/IPrintable_DGlobalEnv.json5
+++ b/idl/IPrintable_DGlobalEnv.json5
@@ -1,7 +1,7 @@
 {
     mode: "implementation",
-    output_cpp_dir: "src/interpreter2/facet",
-    output_hpp_dir: "include/xo/interpreter2",
+    output_cpp_dir: "src/reader2/facet",
+    output_hpp_dir: "include/xo/reader2",
     output_impl_subdir: "env",
     includes: [ "<xo/printable2/Printable.hpp>",
                 "<xo/printable2/detail/IPrintable_Xfer.hpp>" ],
diff --git a/idl/IPrintable_DParenSsm.json5 b/idl/IPrintable_DParenSsm.json5
index 9750cb31..6735436c 100644
--- a/idl/IPrintable_DParenSsm.json5
+++ b/idl/IPrintable_DParenSsm.json5
@@ -2,7 +2,7 @@
     mode: "implementation",
     output_cpp_dir: "src/reader2",
     output_hpp_dir: "include/xo/reader2",
-    output_impl_subdir: "ssm",
+    output_impl_subdir: "paren",
     includes: [ "<xo/printable2/Printable.hpp>",
                 "<xo/printable2/detail/IPrintable_Xfer.hpp>" ],
     local_types: [],
diff --git a/idl/ISyntaxStateMachine_DParenSsm.json5 b/idl/ISyntaxStateMachine_DParenSsm.json5
index 7ea19fc0..dcdb298c 100644
--- a/idl/ISyntaxStateMachine_DParenSsm.json5
+++ b/idl/ISyntaxStateMachine_DParenSsm.json5
@@ -2,7 +2,7 @@
     mode: "implementation",
     output_cpp_dir: "src/reader2",
     output_hpp_dir: "include/xo/reader2",
-    output_impl_subdir: "ssm",
+    output_impl_subdir: "paren",
     includes: [ "\"SyntaxStateMachine.hpp\"",
                 "\"ssm/ISyntaxStateMachine_Xfer.hpp\"" ],
     local_types: [ ],
diff --git a/include/xo/reader2/ParenSsm.hpp b/include/xo/reader2/ParenSsm.hpp
index a9a786fd..30dc4ee5 100644
--- a/include/xo/reader2/ParenSsm.hpp
+++ b/include/xo/reader2/ParenSsm.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "DParenSsm.hpp"
+#include "paren/DParenSsm.hpp"
 #include "ssm/ISyntaxStateMachine_DParenSsm.hpp"
 #include "ssm/IPrintable_DParenSsm.hpp"
 
diff --git a/include/xo/reader2/DParenSsm.hpp b/include/xo/reader2/paren/DParenSsm.hpp
similarity index 100%
rename from include/xo/reader2/DParenSsm.hpp
rename to include/xo/reader2/paren/DParenSsm.hpp
diff --git a/include/xo/reader2/ssm/IPrintable_DParenSsm.hpp b/include/xo/reader2/paren/IPrintable_DParenSsm.hpp
similarity index 100%
rename from include/xo/reader2/ssm/IPrintable_DParenSsm.hpp
rename to include/xo/reader2/paren/IPrintable_DParenSsm.hpp
diff --git a/include/xo/reader2/ssm/ISyntaxStateMachine_DParenSsm.hpp b/include/xo/reader2/paren/ISyntaxStateMachine_DParenSsm.hpp
similarity index 100%
rename from include/xo/reader2/ssm/ISyntaxStateMachine_DParenSsm.hpp
rename to include/xo/reader2/paren/ISyntaxStateMachine_DParenSsm.hpp
diff --git a/src/reader2/IPrintable_DParenSsm.cpp b/src/reader2/IPrintable_DParenSsm.cpp
index b2228f7f..7cda341b 100644
--- a/src/reader2/IPrintable_DParenSsm.cpp
+++ b/src/reader2/IPrintable_DParenSsm.cpp
@@ -11,7 +11,7 @@
  *       [idl/IPrintable_DParenSsm.json5]
 **/
 
-#include "ssm/IPrintable_DParenSsm.hpp"
+#include "paren/IPrintable_DParenSsm.hpp"
 
 namespace xo {
     namespace scm {
diff --git a/src/reader2/ISyntaxStateMachine_DParenSsm.cpp b/src/reader2/ISyntaxStateMachine_DParenSsm.cpp
index 05f5d4cc..555ae683 100644
--- a/src/reader2/ISyntaxStateMachine_DParenSsm.cpp
+++ b/src/reader2/ISyntaxStateMachine_DParenSsm.cpp
@@ -11,7 +11,7 @@
  *       [idl/ISyntaxStateMachine_DParenSsm.json5]
 **/
 
-#include "ssm/ISyntaxStateMachine_DParenSsm.hpp"
+#include "paren/ISyntaxStateMachine_DParenSsm.hpp"
 
 namespace xo {
     namespace scm {