diff --git a/idl/IPrintable_DApplySsm.json5 b/idl/IPrintable_DApplySsm.json5
index 6f2a531d..37330b12 100644
--- a/idl/IPrintable_DApplySsm.json5
+++ b/idl/IPrintable_DApplySsm.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: "apply",
     includes: [ "<xo/printable2/Printable.hpp>",
                 "<xo/printable2/detail/IPrintable_Xfer.hpp>" ],
     local_types: [],
diff --git a/idl/ISyntaxStateMachine_DApplySsm.json5 b/idl/ISyntaxStateMachine_DApplySsm.json5
index bc433fdf..80df12c7 100644
--- a/idl/ISyntaxStateMachine_DApplySsm.json5
+++ b/idl/ISyntaxStateMachine_DApplySsm.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: "apply",
     includes: [ "\"SyntaxStateMachine.hpp\"",
                 "\"ssm/ISyntaxStateMachine_Xfer.hpp\"" ],
     local_types: [ ],
diff --git a/include/xo/reader2/ApplySsm.hpp b/include/xo/reader2/ApplySsm.hpp
index 6e9f9a9d..9ddc5b5a 100644
--- a/include/xo/reader2/ApplySsm.hpp
+++ b/include/xo/reader2/ApplySsm.hpp
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "DApplySsm.hpp"
-#include "ssm/ISyntaxStateMachine_DApplySsm.hpp"
-#include "ssm/IPrintable_DApplySsm.hpp"
+#include "apply/DApplySsm.hpp"
+#include "apply/ISyntaxStateMachine_DApplySsm.hpp"
+#include "apply/IPrintable_DApplySsm.hpp"
 
 /* end ApplySsm.hpp */
diff --git a/include/xo/reader2/DApplySsm.hpp b/include/xo/reader2/apply/DApplySsm.hpp
similarity index 100%
rename from include/xo/reader2/DApplySsm.hpp
rename to include/xo/reader2/apply/DApplySsm.hpp
diff --git a/include/xo/reader2/ssm/IPrintable_DApplySsm.hpp b/include/xo/reader2/apply/IPrintable_DApplySsm.hpp
similarity index 100%
rename from include/xo/reader2/ssm/IPrintable_DApplySsm.hpp
rename to include/xo/reader2/apply/IPrintable_DApplySsm.hpp
diff --git a/include/xo/reader2/ssm/ISyntaxStateMachine_DApplySsm.hpp b/include/xo/reader2/apply/ISyntaxStateMachine_DApplySsm.hpp
similarity index 100%
rename from include/xo/reader2/ssm/ISyntaxStateMachine_DApplySsm.hpp
rename to include/xo/reader2/apply/ISyntaxStateMachine_DApplySsm.hpp
diff --git a/src/reader2/CMakeLists.txt b/src/reader2/CMakeLists.txt
index 6f610db0..455fadee 100644
--- a/src/reader2/CMakeLists.txt
+++ b/src/reader2/CMakeLists.txt
@@ -42,8 +42,8 @@ set(SELF_SRCS
     facet/IPrintable_DLambdaSsm.cpp
 
     DApplySsm.cpp
-    ISyntaxStateMachine_DApplySsm.cpp
-    IPrintable_DApplySsm.cpp
+    facet/ISyntaxStateMachine_DApplySsm.cpp
+    facet/IPrintable_DApplySsm.cpp
 
     DParenSsm.cpp
     ISyntaxStateMachine_DParenSsm.cpp
diff --git a/src/reader2/IPrintable_DApplySsm.cpp b/src/reader2/facet/IPrintable_DApplySsm.cpp
similarity index 94%
rename from src/reader2/IPrintable_DApplySsm.cpp
rename to src/reader2/facet/IPrintable_DApplySsm.cpp
index 5066b082..20e40bfc 100644
--- a/src/reader2/IPrintable_DApplySsm.cpp
+++ b/src/reader2/facet/IPrintable_DApplySsm.cpp
@@ -11,7 +11,7 @@
  *       [idl/IPrintable_DApplySsm.json5]
 **/
 
-#include "ssm/IPrintable_DApplySsm.hpp"
+#include "apply/IPrintable_DApplySsm.hpp"
 
 namespace xo {
     namespace scm {
diff --git a/src/reader2/ISyntaxStateMachine_DApplySsm.cpp b/src/reader2/facet/ISyntaxStateMachine_DApplySsm.cpp
similarity index 98%
rename from src/reader2/ISyntaxStateMachine_DApplySsm.cpp
rename to src/reader2/facet/ISyntaxStateMachine_DApplySsm.cpp
index cd1a550d..abe625c8 100644
--- a/src/reader2/ISyntaxStateMachine_DApplySsm.cpp
+++ b/src/reader2/facet/ISyntaxStateMachine_DApplySsm.cpp
@@ -11,7 +11,7 @@
  *       [idl/ISyntaxStateMachine_DApplySsm.json5]
 **/
 
-#include "ssm/ISyntaxStateMachine_DApplySsm.hpp"
+#include "apply/ISyntaxStateMachine_DApplySsm.hpp"
 
 namespace xo {
     namespace scm {