diff --git a/idl/IPrintable_DDeftypeSsm.json5 b/idl/IPrintable_DDeftypeSsm.json5
index e61f5881..00b81fdb 100644
--- a/idl/IPrintable_DDeftypeSsm.json5
+++ b/idl/IPrintable_DDeftypeSsm.json5
@@ -1,8 +1,8 @@
 {
     mode: "implementation",
-    output_cpp_dir: "src/reader2",
+    output_cpp_dir: "src/reader2/facet",
     output_hpp_dir: "include/xo/reader2",
-    output_impl_subdir: "ssm",
+    output_impl_subdir: "deftype",
     includes: [ "<xo/printable2/Printable.hpp>",
                 "<xo/printable2/detail/IPrintable_Xfer.hpp>" ],
     local_types: [],
diff --git a/idl/ISyntaxStateMachine_DDeftypeSsm.json5 b/idl/ISyntaxStateMachine_DDeftypeSsm.json5
index d3e3b174..722e3409 100644
--- a/idl/ISyntaxStateMachine_DDeftypeSsm.json5
+++ b/idl/ISyntaxStateMachine_DDeftypeSsm.json5
@@ -1,8 +1,8 @@
 {
     mode: "implementation",
-    output_cpp_dir: "src/reader2",
+    output_cpp_dir: "src/reader2/facet",
     output_hpp_dir: "include/xo/reader2",
-    output_impl_subdir: "ssm",
+    output_impl_subdir: "deftype",
     includes: [ "\"SyntaxStateMachine.hpp\"",
                 "\"ssm/ISyntaxStateMachine_Xfer.hpp\"" ],
     local_types: [ ],
diff --git a/include/xo/reader2/DeftypeSsm.hpp b/include/xo/reader2/DeftypeSsm.hpp
index 22ec3eec..324875ba 100644
--- a/include/xo/reader2/DeftypeSsm.hpp
+++ b/include/xo/reader2/DeftypeSsm.hpp
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "DDeftypeSsm.hpp"
-#include "ssm/ISyntaxStateMachine_DDeftypeSsm.hpp"
-#include "ssm/IPrintable_DDeftypeSsm.hpp"
+#include "deftype/DDeftypeSsm.hpp"
+#include "deftype/ISyntaxStateMachine_DDeftypeSsm.hpp"
+#include "deftype/IPrintable_DDeftypeSsm.hpp"
 
 /* end DeftypeSsm.hpp */
diff --git a/include/xo/reader2/DDeftypeSsm.hpp b/include/xo/reader2/deftype/DDeftypeSsm.hpp
similarity index 100%
rename from include/xo/reader2/DDeftypeSsm.hpp
rename to include/xo/reader2/deftype/DDeftypeSsm.hpp
diff --git a/include/xo/reader2/ssm/IPrintable_DDeftypeSsm.hpp b/include/xo/reader2/deftype/IPrintable_DDeftypeSsm.hpp
similarity index 100%
rename from include/xo/reader2/ssm/IPrintable_DDeftypeSsm.hpp
rename to include/xo/reader2/deftype/IPrintable_DDeftypeSsm.hpp
diff --git a/include/xo/reader2/ssm/ISyntaxStateMachine_DDeftypeSsm.hpp b/include/xo/reader2/deftype/ISyntaxStateMachine_DDeftypeSsm.hpp
similarity index 100%
rename from include/xo/reader2/ssm/ISyntaxStateMachine_DDeftypeSsm.hpp
rename to include/xo/reader2/deftype/ISyntaxStateMachine_DDeftypeSsm.hpp
diff --git a/src/reader2/CMakeLists.txt b/src/reader2/CMakeLists.txt
index a6293f3f..6f610db0 100644
--- a/src/reader2/CMakeLists.txt
+++ b/src/reader2/CMakeLists.txt
@@ -26,8 +26,8 @@ set(SELF_SRCS
     IPrintable_DDefineSsm.cpp
 
     DDeftypeSsm.cpp
-    ISyntaxStateMachine_DDeftypeSsm.cpp
-    IPrintable_DDeftypeSsm.cpp
+    facet/ISyntaxStateMachine_DDeftypeSsm.cpp
+    facet/IPrintable_DDeftypeSsm.cpp
 
     DIfElseSsm.cpp
     facet/ISyntaxStateMachine_DIfElseSsm.cpp
diff --git a/src/reader2/DToplevelSeqSsm.cpp b/src/reader2/DToplevelSeqSsm.cpp
index 17365193..2b5b0dcb 100644
--- a/src/reader2/DToplevelSeqSsm.cpp
+++ b/src/reader2/DToplevelSeqSsm.cpp
@@ -6,12 +6,10 @@
 #include "DToplevelSeqSsm.hpp"
 #include "ssm/ISyntaxStateMachine_DToplevelSeqSsm.hpp"
 #include "DDefineSsm.hpp"
-#include "DDeftypeSsm.hpp"
+#include "DeftypeSsm.hpp"
 #include "LambdaSsm.hpp"
-//#include "lambda/DLambdaSsm.hpp"
 #include "ProgressSsm.hpp"
 #include "IfElseSsm.hpp"
-//#include "ifelse/DIfElseSsm.hpp"
 #include "QuoteSsm.hpp"
 #include "ParenSsm.hpp"
 #include "ExpectExprSsm.hpp"
diff --git a/src/reader2/IPrintable_DDeftypeSsm.cpp b/src/reader2/facet/IPrintable_DDeftypeSsm.cpp
similarity index 93%
rename from src/reader2/IPrintable_DDeftypeSsm.cpp
rename to src/reader2/facet/IPrintable_DDeftypeSsm.cpp
index 8f36fd09..eb7351d2 100644
--- a/src/reader2/IPrintable_DDeftypeSsm.cpp
+++ b/src/reader2/facet/IPrintable_DDeftypeSsm.cpp
@@ -11,7 +11,7 @@
  *       [idl/IPrintable_DDeftypeSsm.json5]
 **/
 
-#include "ssm/IPrintable_DDeftypeSsm.hpp"
+#include "deftype/IPrintable_DDeftypeSsm.hpp"
 
 namespace xo {
     namespace scm {
diff --git a/src/reader2/ISyntaxStateMachine_DDeftypeSsm.cpp b/src/reader2/facet/ISyntaxStateMachine_DDeftypeSsm.cpp
similarity index 98%
rename from src/reader2/ISyntaxStateMachine_DDeftypeSsm.cpp
rename to src/reader2/facet/ISyntaxStateMachine_DDeftypeSsm.cpp
index 9fcc835f..2491eee2 100644
--- a/src/reader2/ISyntaxStateMachine_DDeftypeSsm.cpp
+++ b/src/reader2/facet/ISyntaxStateMachine_DDeftypeSsm.cpp
@@ -11,7 +11,7 @@
  *       [idl/ISyntaxStateMachine_DDeftypeSsm.json5]
 **/
 
-#include "ssm/ISyntaxStateMachine_DDeftypeSsm.hpp"
+#include "deftype/ISyntaxStateMachine_DDeftypeSsm.hpp"
 
 namespace xo {
     namespace scm {