diff --git a/idl/IPrintable_DLambdaSsm.json5 b/idl/IPrintable_DLambdaSsm.json5
index 035f71f1..3f625a27 100644
--- a/idl/IPrintable_DLambdaSsm.json5
+++ b/idl/IPrintable_DLambdaSsm.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: "lambda",
     includes: [ "<xo/printable2/Printable.hpp>",
                 "<xo/printable2/detail/IPrintable_Xfer.hpp>" ],
     local_types: [],
diff --git a/idl/ISyntaxStateMachine_DLambdaSsm.json5 b/idl/ISyntaxStateMachine_DLambdaSsm.json5
index 413c64c8..951c511f 100644
--- a/idl/ISyntaxStateMachine_DLambdaSsm.json5
+++ b/idl/ISyntaxStateMachine_DLambdaSsm.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: "lambda",
     includes: [ "\"SyntaxStateMachine.hpp\"",
                 "\"ssm/ISyntaxStateMachine_Xfer.hpp\"" ],
     local_types: [ ],
diff --git a/include/xo/reader2/LambdaSsm.hpp b/include/xo/reader2/LambdaSsm.hpp
index 49ac731b..25e7a2e4 100644
--- a/include/xo/reader2/LambdaSsm.hpp
+++ b/include/xo/reader2/LambdaSsm.hpp
@@ -3,8 +3,8 @@
  *  @author Roland Conybeare, Feb 2026
  **/
 
-#include "DLambdaSsm.hpp"
-#include "ssm/ISyntaxStateMachine_DLambdaSsm.hpp"
-#include "ssm/IPrintable_DLambdaSsm.hpp"
+#include "lambda/DLambdaSsm.hpp"
+#include "lambda/ISyntaxStateMachine_DLambdaSsm.hpp"
+#include "lambda/IPrintable_DLambdaSsm.hpp"
 
 /* end LambdaSsm.hpp */
diff --git a/include/xo/reader2/DLambdaSsm.hpp b/include/xo/reader2/lambda/DLambdaSsm.hpp
similarity index 100%
rename from include/xo/reader2/DLambdaSsm.hpp
rename to include/xo/reader2/lambda/DLambdaSsm.hpp
diff --git a/include/xo/reader2/ssm/IPrintable_DLambdaSsm.hpp b/include/xo/reader2/lambda/IPrintable_DLambdaSsm.hpp
similarity index 100%
rename from include/xo/reader2/ssm/IPrintable_DLambdaSsm.hpp
rename to include/xo/reader2/lambda/IPrintable_DLambdaSsm.hpp
diff --git a/include/xo/reader2/ssm/ISyntaxStateMachine_DLambdaSsm.hpp b/include/xo/reader2/lambda/ISyntaxStateMachine_DLambdaSsm.hpp
similarity index 100%
rename from include/xo/reader2/ssm/ISyntaxStateMachine_DLambdaSsm.hpp
rename to include/xo/reader2/lambda/ISyntaxStateMachine_DLambdaSsm.hpp
diff --git a/src/reader2/CMakeLists.txt b/src/reader2/CMakeLists.txt
index 66a5e8f8..a6293f3f 100644
--- a/src/reader2/CMakeLists.txt
+++ b/src/reader2/CMakeLists.txt
@@ -38,8 +38,8 @@ set(SELF_SRCS
     IPrintable_DSequenceSsm.cpp
 
     DLambdaSsm.cpp
-    ISyntaxStateMachine_DLambdaSsm.cpp
-    IPrintable_DLambdaSsm.cpp
+    facet/ISyntaxStateMachine_DLambdaSsm.cpp
+    facet/IPrintable_DLambdaSsm.cpp
 
     DApplySsm.cpp
     ISyntaxStateMachine_DApplySsm.cpp
diff --git a/src/reader2/DToplevelSeqSsm.cpp b/src/reader2/DToplevelSeqSsm.cpp
index f43d1a62..17365193 100644
--- a/src/reader2/DToplevelSeqSsm.cpp
+++ b/src/reader2/DToplevelSeqSsm.cpp
@@ -7,7 +7,8 @@
 #include "ssm/ISyntaxStateMachine_DToplevelSeqSsm.hpp"
 #include "DDefineSsm.hpp"
 #include "DDeftypeSsm.hpp"
-#include "DLambdaSsm.hpp"
+#include "LambdaSsm.hpp"
+//#include "lambda/DLambdaSsm.hpp"
 #include "ProgressSsm.hpp"
 #include "IfElseSsm.hpp"
 //#include "ifelse/DIfElseSsm.hpp"
@@ -24,13 +25,13 @@
 #include <xo/alloc2/GCObject.hpp>
 
 namespace xo {
-    using xo::scm::DProgressSsm;
+    //using xo::scm::DProgressSsm;
     using xo::scm::DConstant;
-    using xo::scm::DFloat;
+    //using xo::scm::DFloat;
     using xo::mm::AGCObject;
-    using xo::mm::AAllocator;
+    //using xo::mm::AAllocator;
     using xo::mm::DArena;
-    using xo::facet::with_facet;
+    //using xo::facet::with_facet;
     using xo::reflect::typeseq;
 
     namespace scm {
diff --git a/src/reader2/IPrintable_DLambdaSsm.cpp b/src/reader2/facet/IPrintable_DLambdaSsm.cpp
similarity index 93%
rename from src/reader2/IPrintable_DLambdaSsm.cpp
rename to src/reader2/facet/IPrintable_DLambdaSsm.cpp
index 4e7a09d8..bd1437bd 100644
--- a/src/reader2/IPrintable_DLambdaSsm.cpp
+++ b/src/reader2/facet/IPrintable_DLambdaSsm.cpp
@@ -11,7 +11,7 @@
  *       [idl/IPrintable_DLambdaSsm.json5]
 **/
 
-#include "ssm/IPrintable_DLambdaSsm.hpp"
+#include "lambda/IPrintable_DLambdaSsm.hpp"
 
 namespace xo {
     namespace scm {
diff --git a/src/reader2/ISyntaxStateMachine_DLambdaSsm.cpp b/src/reader2/facet/ISyntaxStateMachine_DLambdaSsm.cpp
similarity index 98%
rename from src/reader2/ISyntaxStateMachine_DLambdaSsm.cpp
rename to src/reader2/facet/ISyntaxStateMachine_DLambdaSsm.cpp
index e131c12d..098e49c3 100644
--- a/src/reader2/ISyntaxStateMachine_DLambdaSsm.cpp
+++ b/src/reader2/facet/ISyntaxStateMachine_DLambdaSsm.cpp
@@ -11,7 +11,7 @@
  *       [idl/ISyntaxStateMachine_DLambdaSsm.json5]
 **/
 
-#include "ssm/ISyntaxStateMachine_DLambdaSsm.hpp"
+#include "lambda/ISyntaxStateMachine_DLambdaSsm.hpp"
 
 namespace xo {
     namespace scm {