diff --git a/src/test/app/Escrow_test.cpp b/src/test/app/Escrow_test.cpp
index 640743a869..c07f3edd61 100644
--- a/src/test/app/Escrow_test.cpp
+++ b/src/test/app/Escrow_test.cpp
@@ -20,8 +20,8 @@
 #include <test/app/wasm_fixtures/fixtures.h>
 #include <test/jtx.h>
 
-#include <xrpld/app/misc/WasmVM.h>
 #include <xrpld/app/tx/applySteps.h>
+#include <xrpld/app/wasm/WasmVM.h>
 #include <xrpld/ledger/Dir.h>
 
 #include <xrpl/protocol/Feature.h>
diff --git a/src/test/app/WasmHostFuncImpl_test.cpp b/src/test/app/HostFuncImpl_test.cpp
similarity index 99%
rename from src/test/app/WasmHostFuncImpl_test.cpp
rename to src/test/app/HostFuncImpl_test.cpp
index bab142391d..980d8d2b43 100644
--- a/src/test/app/WasmHostFuncImpl_test.cpp
+++ b/src/test/app/HostFuncImpl_test.cpp
@@ -19,7 +19,7 @@
 
 #include <test/jtx.h>
 
-#include <xrpld/app/misc/WasmHostFuncImpl.h>
+#include <xrpld/app/wasm/HostFuncImpl.h>
 
 namespace ripple {
 namespace test {
@@ -86,7 +86,7 @@ createApplyContext(
     return ac;
 }
 
-struct WasmHostFuncImpl_test : public beast::unit_test::suite
+struct HostFuncImpl_test : public beast::unit_test::suite
 {
     void
     testGetLedgerSqn()
@@ -2855,7 +2855,7 @@ struct WasmHostFuncImpl_test : public beast::unit_test::suite
     }
 };
 
-BEAST_DEFINE_TESTSUITE(WasmHostFuncImpl, app, ripple);
+BEAST_DEFINE_TESTSUITE(HostFuncImpl, app, ripple);
 
 }  // namespace test
 }  // namespace ripple
diff --git a/src/test/app/TestHostFunctions.h b/src/test/app/TestHostFunctions.h
index 562d2091a0..2d7793463f 100644
--- a/src/test/app/TestHostFunctions.h
+++ b/src/test/app/TestHostFunctions.h
@@ -21,9 +21,9 @@
 #include <test/jtx.h>
 
 #include <xrpld/app/misc/AmendmentTable.h>
-#include <xrpld/app/misc/WasmHostFunc.h>
-#include <xrpld/app/misc/WasmVM.h>
 #include <xrpld/app/tx/detail/NFTokenUtils.h>
+#include <xrpld/app/wasm/HostFunc.h>
+#include <xrpld/app/wasm/WasmVM.h>
 #include <xrpld/ledger/detail/ApplyViewBase.h>
 
 namespace ripple {
diff --git a/src/test/app/Wasm_test.cpp b/src/test/app/Wasm_test.cpp
index c8db385c67..002dc22ac4 100644
--- a/src/test/app/Wasm_test.cpp
+++ b/src/test/app/Wasm_test.cpp
@@ -23,8 +23,8 @@
 
 #include <test/app/TestHostFunctions.h>
 
-#include <xrpld/app/misc/WamrVM.h>
-#include <xrpld/app/misc/WasmHostFuncWrapper.h>
+#include <xrpld/app/wasm/HostFuncWrapper.h>
+#include <xrpld/app/wasm/WamrVM.h>
 
 namespace ripple {
 namespace test {
diff --git a/src/xrpld/app/tx/detail/Escrow.cpp b/src/xrpld/app/tx/detail/Escrow.cpp
index 9ba02cc877..4b5a92e8c2 100644
--- a/src/xrpld/app/tx/detail/Escrow.cpp
+++ b/src/xrpld/app/tx/detail/Escrow.cpp
@@ -19,10 +19,10 @@
 
 #include <xrpld/app/misc/CredentialHelpers.h>
 #include <xrpld/app/misc/HashRouter.h>
-#include <xrpld/app/misc/WasmHostFuncImpl.h>
-#include <xrpld/app/misc/WasmVM.h>
 #include <xrpld/app/tx/detail/Escrow.h>
 #include <xrpld/app/tx/detail/MPTokenAuthorize.h>
+#include <xrpld/app/wasm/HostFuncImpl.h>
+#include <xrpld/app/wasm/WasmVM.h>
 #include <xrpld/conditions/Condition.h>
 #include <xrpld/conditions/Fulfillment.h>
 #include <xrpld/ledger/ApplyView.h>
diff --git a/src/xrpld/app/misc/WasmHostFunc.h b/src/xrpld/app/wasm/HostFunc.h
similarity index 99%
rename from src/xrpld/app/misc/WasmHostFunc.h
rename to src/xrpld/app/wasm/HostFunc.h
index cd1848a522..865ce49fb3 100644
--- a/src/xrpld/app/misc/WasmHostFunc.h
+++ b/src/xrpld/app/wasm/HostFunc.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <xrpld/app/misc/WasmParamsHelper.h>
+#include <xrpld/app/wasm/ParamsHelper.h>
 
 #include <xrpl/basics/Expected.h>
 #include <xrpl/basics/Slice.h>
diff --git a/src/xrpld/app/misc/WasmHostFuncImpl.h b/src/xrpld/app/wasm/HostFuncImpl.h
similarity index 99%
rename from src/xrpld/app/misc/WasmHostFuncImpl.h
rename to src/xrpld/app/wasm/HostFuncImpl.h
index a56c237943..4067afccb4 100644
--- a/src/xrpld/app/misc/WasmHostFuncImpl.h
+++ b/src/xrpld/app/wasm/HostFuncImpl.h
@@ -19,8 +19,8 @@
 
 #pragma once
 
-#include <xrpld/app/misc/WasmHostFunc.h>
 #include <xrpld/app/tx/detail/ApplyContext.h>
+#include <xrpld/app/wasm/HostFunc.h>
 
 namespace ripple {
 class WasmHostFunctionsImpl : public HostFunctions
diff --git a/src/xrpld/app/misc/WasmHostFuncWrapper.h b/src/xrpld/app/wasm/HostFuncWrapper.h
similarity index 99%
rename from src/xrpld/app/misc/WasmHostFuncWrapper.h
rename to src/xrpld/app/wasm/HostFuncWrapper.h
index aac8ba387e..a6cbd91b18 100644
--- a/src/xrpld/app/misc/WasmHostFuncWrapper.h
+++ b/src/xrpld/app/wasm/HostFuncWrapper.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <xrpld/app/misc/WamrVM.h>
+#include <xrpld/app/wasm/WamrVM.h>
 
 namespace ripple {
 
diff --git a/src/xrpld/app/misc/WasmParamsHelper.h b/src/xrpld/app/wasm/ParamsHelper.h
similarity index 100%
rename from src/xrpld/app/misc/WasmParamsHelper.h
rename to src/xrpld/app/wasm/ParamsHelper.h
diff --git a/src/xrpld/app/misc/WamrVM.h b/src/xrpld/app/wasm/WamrVM.h
similarity index 99%
rename from src/xrpld/app/misc/WamrVM.h
rename to src/xrpld/app/wasm/WamrVM.h
index 3be35c673e..a32257feb6 100644
--- a/src/xrpld/app/misc/WamrVM.h
+++ b/src/xrpld/app/wasm/WamrVM.h
@@ -18,7 +18,7 @@
 //==============================================================================
 #pragma once
 
-#include <xrpld/app/misc/WasmVM.h>
+#include <xrpld/app/wasm/WasmVM.h>
 
 #include <wasm_c_api.h>
 #include <wasm_export.h>
diff --git a/src/xrpld/app/misc/WasmVM.h b/src/xrpld/app/wasm/WasmVM.h
similarity index 98%
rename from src/xrpld/app/misc/WasmVM.h
rename to src/xrpld/app/wasm/WasmVM.h
index d4a9072740..32eb239f60 100644
--- a/src/xrpld/app/misc/WasmVM.h
+++ b/src/xrpld/app/wasm/WasmVM.h
@@ -18,7 +18,7 @@
 //==============================================================================
 #pragma once
 
-#include <xrpld/app/misc/WasmHostFunc.h>
+#include <xrpld/app/wasm/HostFunc.h>
 
 #include <string_view>
 
diff --git a/src/xrpld/app/misc/WasmHostFuncImpl.cpp b/src/xrpld/app/wasm/detail/HostFuncImpl.cpp
similarity index 99%
rename from src/xrpld/app/misc/WasmHostFuncImpl.cpp
rename to src/xrpld/app/wasm/detail/HostFuncImpl.cpp
index ed5417ce0f..d619c6e58f 100644
--- a/src/xrpld/app/misc/WasmHostFuncImpl.cpp
+++ b/src/xrpld/app/wasm/detail/HostFuncImpl.cpp
@@ -18,8 +18,8 @@
 //==============================================================================
 
 #include <xrpld/app/misc/AmendmentTable.h>
-#include <xrpld/app/misc/WasmHostFuncImpl.h>
 #include <xrpld/app/tx/detail/NFTokenUtils.h>
+#include <xrpld/app/wasm/HostFuncImpl.h>
 
 #include <xrpl/protocol/STBitString.h>
 #include <xrpl/protocol/digest.h>
diff --git a/src/xrpld/app/misc/WasmHostFuncWrapper.cpp b/src/xrpld/app/wasm/detail/HostFuncWrapper.cpp
similarity index 99%
rename from src/xrpld/app/misc/WasmHostFuncWrapper.cpp
rename to src/xrpld/app/wasm/detail/HostFuncWrapper.cpp
index 6fb7b0c58c..20b52e418f 100644
--- a/src/xrpld/app/misc/WasmHostFuncWrapper.cpp
+++ b/src/xrpld/app/wasm/detail/HostFuncWrapper.cpp
@@ -17,10 +17,10 @@
 */
 //==============================================================================
 
-#include <xrpld/app/misc/WamrVM.h>
-#include <xrpld/app/misc/WasmHostFunc.h>
-#include <xrpld/app/misc/WasmHostFuncWrapper.h>
 #include <xrpld/app/tx/detail/NFTokenUtils.h>
+#include <xrpld/app/wasm/HostFunc.h>
+#include <xrpld/app/wasm/HostFuncWrapper.h>
+#include <xrpld/app/wasm/WamrVM.h>
 
 #include <xrpl/protocol/STNumber.h>
 #include <xrpl/protocol/digest.h>
diff --git a/src/xrpld/app/misc/WamrVM.cpp b/src/xrpld/app/wasm/detail/WamrVM.cpp
similarity index 99%
rename from src/xrpld/app/misc/WamrVM.cpp
rename to src/xrpld/app/wasm/detail/WamrVM.cpp
index 3f0bd1d95f..d7cf9aa78d 100644
--- a/src/xrpld/app/misc/WamrVM.cpp
+++ b/src/xrpld/app/wasm/detail/WamrVM.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-#include <xrpld/app/misc/WamrVM.h>
+#include <xrpld/app/wasm/WamrVM.h>
 
 #include <xrpl/basics/Log.h>
 
diff --git a/src/xrpld/app/misc/WasmVM.cpp b/src/xrpld/app/wasm/detail/WasmVM.cpp
similarity index 98%
rename from src/xrpld/app/misc/WasmVM.cpp
rename to src/xrpld/app/wasm/detail/WasmVM.cpp
index d815c9939d..7d20f67fa1 100644
--- a/src/xrpld/app/misc/WasmVM.cpp
+++ b/src/xrpld/app/wasm/detail/WasmVM.cpp
@@ -21,9 +21,9 @@
 // #define DEBUG_OUTPUT 1
 #endif
 
-#include <xrpld/app/misc/WamrVM.h>
-#include <xrpld/app/misc/WasmHostFunc.h>
-#include <xrpld/app/misc/WasmHostFuncWrapper.h>
+#include <xrpld/app/wasm/HostFunc.h>
+#include <xrpld/app/wasm/HostFuncWrapper.h>
+#include <xrpld/app/wasm/WamrVM.h>
 
 #include <xrpl/basics/Log.h>
 #include <xrpl/protocol/AccountID.h>