diff --git a/fxjs/BUILD.gn b/fxjs/BUILD.gn
index 32c435f..4c4df16 100644
--- a/fxjs/BUILD.gn
+++ b/fxjs/BUILD.gn
@@ -119,26 +119,24 @@
 
     if (pdf_enable_xfa) {
       sources += [
-        "cfxjse_arguments.cpp",
-        "cfxjse_arguments.h",
-        "cfxjse_class.cpp",
-        "cfxjse_class.h",
-        "cfxjse_context.cpp",
-        "cfxjse_context.h",
-        "cfxjse_engine.cpp",
-        "cfxjse_engine.h",
-        "cfxjse_formcalc_context.cpp",
-        "cfxjse_formcalc_context.h",
-        "cfxjse_isolatetracker.cpp",
-        "cfxjse_isolatetracker.h",
-        "cfxjse_resolveprocessor.cpp",
-        "cfxjse_resolveprocessor.h",
-        "cfxjse_runtimedata.cpp",
-        "cfxjse_runtimedata.h",
-        "cfxjse_value.cpp",
-        "cfxjse_value.h",
-        "fxjse.cpp",
-        "fxjse.h",
+        "xfa/cfxjse_arguments.cpp",
+        "xfa/cfxjse_arguments.h",
+        "xfa/cfxjse_class.cpp",
+        "xfa/cfxjse_class.h",
+        "xfa/cfxjse_context.cpp",
+        "xfa/cfxjse_context.h",
+        "xfa/cfxjse_engine.cpp",
+        "xfa/cfxjse_engine.h",
+        "xfa/cfxjse_formcalc_context.cpp",
+        "xfa/cfxjse_formcalc_context.h",
+        "xfa/cfxjse_isolatetracker.cpp",
+        "xfa/cfxjse_isolatetracker.h",
+        "xfa/cfxjse_resolveprocessor.cpp",
+        "xfa/cfxjse_resolveprocessor.h",
+        "xfa/cfxjse_runtimedata.cpp",
+        "xfa/cfxjse_runtimedata.h",
+        "xfa/cfxjse_value.cpp",
+        "xfa/cfxjse_value.h",
         "xfa/cjx_arc.cpp",
         "xfa/cjx_arc.h",
         "xfa/cjx_area.cpp",
@@ -439,6 +437,8 @@
         "xfa/cjx_xmlconnection.h",
         "xfa/cjx_xsdconnection.cpp",
         "xfa/cjx_xsdconnection.h",
+        "xfa/fxjse.cpp",
+        "xfa/fxjse.h",
       ]
       deps += [ "../xfa/fxfa/fm2js" ]
     }
@@ -474,7 +474,7 @@
     pdfium_root_dir = "../"
 
     if (pdf_enable_xfa) {
-      sources += [ "cfxjse_formcalc_context_embeddertest.cpp" ]
+      sources += [ "xfa/cfxjse_formcalc_context_embeddertest.cpp" ]
       deps += [ "..///xfa/fxfa" ]
     }
   }
diff --git a/fxjs/cfxjs_engine.cpp b/fxjs/cfxjs_engine.cpp
index 9274cd3..c4d46a2 100644
--- a/fxjs/cfxjs_engine.cpp
+++ b/fxjs/cfxjs_engine.cpp
@@ -11,8 +11,8 @@
 #include <vector>
 
 #include "core/fxcrt/unowned_ptr.h"
-#include "fxjs/cfxjse_runtimedata.h"
 #include "fxjs/cjs_object.h"
+#include "fxjs/xfa/cfxjse_runtimedata.h"
 #include "third_party/base/ptr_util.h"
 #include "third_party/base/stl_util.h"
 #include "v8/include/v8-util.h"
diff --git a/fxjs/cjs_runtime.cpp b/fxjs/cjs_runtime.cpp
index fb2a6e2..2685677 100644
--- a/fxjs/cjs_runtime.cpp
+++ b/fxjs/cjs_runtime.cpp
@@ -40,7 +40,7 @@
 #include "third_party/base/ptr_util.h"
 
 #ifdef PDF_ENABLE_XFA
-#include "fxjs/cfxjse_value.h"
+#include "fxjs/xfa/cfxjse_value.h"
 #endif  // PDF_ENABLE_XFA
 
 CJS_Runtime::CJS_Runtime(CPDFSDK_FormFillEnvironment* pFormFillEnv)
diff --git a/fxjs/cfxjse_arguments.cpp b/fxjs/xfa/cfxjse_arguments.cpp
similarity index 93%
rename from fxjs/cfxjse_arguments.cpp
rename to fxjs/xfa/cfxjse_arguments.cpp
index e18e3e3..8bfc8e3 100644
--- a/fxjs/cfxjse_arguments.cpp
+++ b/fxjs/xfa/cfxjse_arguments.cpp
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fxjs/cfxjse_arguments.h"
+#include "fxjs/xfa/cfxjse_arguments.h"
 
-#include "fxjs/cfxjse_context.h"
-#include "fxjs/cfxjse_value.h"
+#include "fxjs/xfa/cfxjse_context.h"
+#include "fxjs/xfa/cfxjse_value.h"
 #include "third_party/base/ptr_util.h"
 
 CFXJSE_Arguments::CFXJSE_Arguments(
diff --git a/fxjs/cfxjse_arguments.h b/fxjs/xfa/cfxjse_arguments.h
similarity index 89%
rename from fxjs/cfxjse_arguments.h
rename to fxjs/xfa/cfxjse_arguments.h
index e923465..e048bc2 100644
--- a/fxjs/cfxjse_arguments.h
+++ b/fxjs/xfa/cfxjse_arguments.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJS_CFXJSE_ARGUMENTS_H_
-#define FXJS_CFXJSE_ARGUMENTS_H_
+#ifndef FXJS_XFA_CFXJSE_ARGUMENTS_H_
+#define FXJS_XFA_CFXJSE_ARGUMENTS_H_
 
 #include <memory>
 
@@ -34,4 +34,4 @@
   UnownedPtr<CFXJSE_Value> const m_pRetValue;
 };
 
-#endif  // FXJS_CFXJSE_ARGUMENTS_H_
+#endif  // FXJS_XFA_CFXJSE_ARGUMENTS_H_
diff --git a/fxjs/cfxjse_class.cpp b/fxjs/xfa/cfxjse_class.cpp
similarity index 98%
rename from fxjs/cfxjse_class.cpp
rename to fxjs/xfa/cfxjse_class.cpp
index 266e0f1..b5098c8 100644
--- a/fxjs/cfxjse_class.cpp
+++ b/fxjs/xfa/cfxjse_class.cpp
@@ -4,17 +4,17 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fxjs/cfxjse_class.h"
+#include "fxjs/xfa/cfxjse_class.h"
 
 #include <memory>
 #include <utility>
 
-#include "fxjs/cfxjse_arguments.h"
-#include "fxjs/cfxjse_context.h"
-#include "fxjs/cfxjse_isolatetracker.h"
-#include "fxjs/cfxjse_value.h"
 #include "fxjs/cjs_result.h"
 #include "fxjs/js_resources.h"
+#include "fxjs/xfa/cfxjse_arguments.h"
+#include "fxjs/xfa/cfxjse_context.h"
+#include "fxjs/xfa/cfxjse_isolatetracker.h"
+#include "fxjs/xfa/cfxjse_value.h"
 #include "third_party/base/ptr_util.h"
 
 using pdfium::fxjse::kFuncTag;
diff --git a/fxjs/cfxjse_class.h b/fxjs/xfa/cfxjse_class.h
similarity index 88%
rename from fxjs/cfxjse_class.h
rename to fxjs/xfa/cfxjse_class.h
index 9b4444a..f5bc232 100644
--- a/fxjs/cfxjse_class.h
+++ b/fxjs/xfa/cfxjse_class.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJS_CFXJSE_CLASS_H_
-#define FXJS_CFXJSE_CLASS_H_
+#ifndef FXJS_XFA_CFXJSE_CLASS_H_
+#define FXJS_XFA_CFXJSE_CLASS_H_
 
 #include "core/fxcrt/unowned_ptr.h"
-#include "fxjs/fxjse.h"
+#include "fxjs/xfa/fxjse.h"
 #include "v8/include/v8.h"
 
 class CFXJSE_Context;
@@ -37,4 +37,4 @@
   v8::Global<v8::FunctionTemplate> m_hTemplate;
 };
 
-#endif  // FXJS_CFXJSE_CLASS_H_
+#endif  // FXJS_XFA_CFXJSE_CLASS_H_
diff --git a/fxjs/cfxjse_context.cpp b/fxjs/xfa/cfxjse_context.cpp
similarity index 98%
rename from fxjs/cfxjse_context.cpp
rename to fxjs/xfa/cfxjse_context.cpp
index 8f490b1..c463a4c 100644
--- a/fxjs/cfxjse_context.cpp
+++ b/fxjs/xfa/cfxjse_context.cpp
@@ -4,15 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fxjs/cfxjse_context.h"
+#include "fxjs/xfa/cfxjse_context.h"
 
 #include <utility>
 
 #include "fxjs/cfxjs_engine.h"
-#include "fxjs/cfxjse_class.h"
-#include "fxjs/cfxjse_isolatetracker.h"
-#include "fxjs/cfxjse_runtimedata.h"
-#include "fxjs/cfxjse_value.h"
+#include "fxjs/xfa/cfxjse_class.h"
+#include "fxjs/xfa/cfxjse_isolatetracker.h"
+#include "fxjs/xfa/cfxjse_runtimedata.h"
+#include "fxjs/xfa/cfxjse_value.h"
 #include "third_party/base/ptr_util.h"
 
 namespace {
diff --git a/fxjs/cfxjse_context.h b/fxjs/xfa/cfxjse_context.h
similarity index 93%
rename from fxjs/cfxjse_context.h
rename to fxjs/xfa/cfxjse_context.h
index 4f65b04..dded868 100644
--- a/fxjs/cfxjse_context.h
+++ b/fxjs/xfa/cfxjse_context.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJS_CFXJSE_CONTEXT_H_
-#define FXJS_CFXJSE_CONTEXT_H_
+#ifndef FXJS_XFA_CFXJSE_CONTEXT_H_
+#define FXJS_XFA_CFXJSE_CONTEXT_H_
 
 #include <memory>
 #include <vector>
@@ -54,4 +54,4 @@
 
 CFXJSE_HostObject* FXJSE_RetrieveObjectBinding(v8::Local<v8::Object> hJSObject);
 
-#endif  // FXJS_CFXJSE_CONTEXT_H_
+#endif  // FXJS_XFA_CFXJSE_CONTEXT_H_
diff --git a/fxjs/cfxjse_engine.cpp b/fxjs/xfa/cfxjse_engine.cpp
similarity index 98%
rename from fxjs/cfxjse_engine.cpp
rename to fxjs/xfa/cfxjse_engine.cpp
index 633315f..43a6ea3 100644
--- a/fxjs/cfxjse_engine.cpp
+++ b/fxjs/xfa/cfxjse_engine.cpp
@@ -4,19 +4,19 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fxjs/cfxjse_engine.h"
+#include "fxjs/xfa/cfxjse_engine.h"
 
 #include <utility>
 
 #include "core/fxcrt/autorestorer.h"
 #include "core/fxcrt/cfx_widetextbuf.h"
 #include "core/fxcrt/fx_extension.h"
-#include "fxjs/cfxjse_class.h"
-#include "fxjs/cfxjse_context.h"
-#include "fxjs/cfxjse_formcalc_context.h"
-#include "fxjs/cfxjse_resolveprocessor.h"
-#include "fxjs/cfxjse_value.h"
 #include "fxjs/cjs_runtime.h"
+#include "fxjs/xfa/cfxjse_class.h"
+#include "fxjs/xfa/cfxjse_context.h"
+#include "fxjs/xfa/cfxjse_formcalc_context.h"
+#include "fxjs/xfa/cfxjse_resolveprocessor.h"
+#include "fxjs/xfa/cfxjse_value.h"
 #include "fxjs/xfa/cjx_object.h"
 #include "third_party/base/ptr_util.h"
 #include "third_party/base/stl_util.h"
diff --git a/fxjs/cfxjse_engine.h b/fxjs/xfa/cfxjse_engine.h
similarity index 97%
rename from fxjs/cfxjse_engine.h
rename to fxjs/xfa/cfxjse_engine.h
index f9bacb9..dc71fcb 100644
--- a/fxjs/cfxjse_engine.h
+++ b/fxjs/xfa/cfxjse_engine.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJS_CFXJSE_ENGINE_H_
-#define FXJS_CFXJSE_ENGINE_H_
+#ifndef FXJS_XFA_CFXJSE_ENGINE_H_
+#define FXJS_XFA_CFXJSE_ENGINE_H_
 
 #include <map>
 #include <memory>
@@ -139,4 +139,4 @@
   XFA_AttributeValue m_eRunAtType = XFA_AttributeValue::Client;
 };
 
-#endif  //  FXJS_CFXJSE_ENGINE_H_
+#endif  //  FXJS_XFA_CFXJSE_ENGINE_H_
diff --git a/fxjs/cfxjse_formcalc_context.cpp b/fxjs/xfa/cfxjse_formcalc_context.cpp
similarity index 99%
rename from fxjs/cfxjse_formcalc_context.cpp
rename to fxjs/xfa/cfxjse_formcalc_context.cpp
index 7f488ed..45a1a65 100644
--- a/fxjs/cfxjse_formcalc_context.cpp
+++ b/fxjs/xfa/cfxjse_formcalc_context.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fxjs/cfxjse_formcalc_context.h"
+#include "fxjs/xfa/cfxjse_formcalc_context.h"
 
 #include <algorithm>
 #include <cstdlib>
@@ -16,11 +16,11 @@
 #include "core/fxcrt/fx_extension.h"
 #include "core/fxcrt/fx_random.h"
 #include "core/fxcrt/locale_iface.h"
-#include "fxjs/cfxjse_arguments.h"
-#include "fxjs/cfxjse_class.h"
-#include "fxjs/cfxjse_context.h"
-#include "fxjs/cfxjse_engine.h"
-#include "fxjs/cfxjse_value.h"
+#include "fxjs/xfa/cfxjse_arguments.h"
+#include "fxjs/xfa/cfxjse_class.h"
+#include "fxjs/xfa/cfxjse_context.h"
+#include "fxjs/xfa/cfxjse_engine.h"
+#include "fxjs/xfa/cfxjse_value.h"
 #include "fxjs/xfa/cjx_object.h"
 #include "third_party/base/ptr_util.h"
 #include "third_party/base/stl_util.h"
@@ -447,12 +447,11 @@
   }
 }
 
-ByteString GetLocalDateTimeFormat(
-    CXFA_Document* pDoc,
-    int32_t iStyle,
-    const ByteStringView& szLocale,
-    bool bStandard,
-    bool bIsDate) {
+ByteString GetLocalDateTimeFormat(CXFA_Document* pDoc,
+                                  int32_t iStyle,
+                                  const ByteStringView& szLocale,
+                                  bool bStandard,
+                                  bool bIsDate) {
   CXFA_LocaleMgr* pMgr = pDoc->GetLocaleMgr();
   LocaleIface* pLocale = LocaleFromString(pDoc, pMgr, szLocale);
   if (!pLocale)
diff --git a/fxjs/cfxjse_formcalc_context.h b/fxjs/xfa/cfxjse_formcalc_context.h
similarity index 98%
rename from fxjs/cfxjse_formcalc_context.h
rename to fxjs/xfa/cfxjse_formcalc_context.h
index 68add34..fcc223d 100644
--- a/fxjs/cfxjse_formcalc_context.h
+++ b/fxjs/xfa/cfxjse_formcalc_context.h
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJS_CFXJSE_FORMCALC_CONTEXT_H_
-#define FXJS_CFXJSE_FORMCALC_CONTEXT_H_
+#ifndef FXJS_XFA_CFXJSE_FORMCALC_CONTEXT_H_
+#define FXJS_XFA_CFXJSE_FORMCALC_CONTEXT_H_
 
 #include <memory>
 #include <vector>
 
 #include "core/fxcrt/unowned_ptr.h"
-#include "fxjs/fxjse.h"
+#include "fxjs/xfa/fxjse.h"
 #include "xfa/fxfa/parser/xfa_resolvenode_rs.h"
 
 class CFXJSE_Arguments;
@@ -407,4 +407,4 @@
   UnownedPtr<CXFA_Document> const m_pDocument;
 };
 
-#endif  // FXJS_CFXJSE_FORMCALC_CONTEXT_H_
+#endif  // FXJS_XFA_CFXJSE_FORMCALC_CONTEXT_H_
diff --git a/fxjs/cfxjse_formcalc_context_embeddertest.cpp b/fxjs/xfa/cfxjse_formcalc_context_embeddertest.cpp
similarity index 99%
rename from fxjs/cfxjse_formcalc_context_embeddertest.cpp
rename to fxjs/xfa/cfxjse_formcalc_context_embeddertest.cpp
index 30a3143..f0b2d78 100644
--- a/fxjs/cfxjse_formcalc_context_embeddertest.cpp
+++ b/fxjs/xfa/cfxjse_formcalc_context_embeddertest.cpp
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "fxjs/cfxjse_engine.h"
-#include "fxjs/cfxjse_value.h"
+#include "fxjs/xfa/cfxjse_engine.h"
+#include "fxjs/xfa/cfxjse_value.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/xfa_js_embedder_test.h"
 #include "xfa/fxfa/cxfa_eventparam.h"
diff --git a/fxjs/cfxjse_isolatetracker.cpp b/fxjs/xfa/cfxjse_isolatetracker.cpp
similarity index 90%
rename from fxjs/cfxjse_isolatetracker.cpp
rename to fxjs/xfa/cfxjse_isolatetracker.cpp
index c126575..6a29e44 100644
--- a/fxjs/cfxjse_isolatetracker.cpp
+++ b/fxjs/xfa/cfxjse_isolatetracker.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fxjs/cfxjse_isolatetracker.h"
+#include "fxjs/xfa/cfxjse_isolatetracker.h"
 
-#include "fxjs/cfxjse_runtimedata.h"
+#include "fxjs/xfa/cfxjse_runtimedata.h"
 
 CFXJSE_ScopeUtil_IsolateHandle::CFXJSE_ScopeUtil_IsolateHandle(
     v8::Isolate* pIsolate)
diff --git a/fxjs/cfxjse_isolatetracker.h b/fxjs/xfa/cfxjse_isolatetracker.h
similarity index 90%
rename from fxjs/cfxjse_isolatetracker.h
rename to fxjs/xfa/cfxjse_isolatetracker.h
index 0f336e2..05d9729 100644
--- a/fxjs/cfxjse_isolatetracker.h
+++ b/fxjs/xfa/cfxjse_isolatetracker.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJS_CFXJSE_ISOLATETRACKER_H_
-#define FXJS_CFXJSE_ISOLATETRACKER_H_
+#ifndef FXJS_XFA_CFXJSE_ISOLATETRACKER_H_
+#define FXJS_XFA_CFXJSE_ISOLATETRACKER_H_
 
 #include "v8/include/v8.h"
 
@@ -41,4 +41,4 @@
   v8::Context::Scope m_cscope;
 };
 
-#endif  // FXJS_CFXJSE_ISOLATETRACKER_H_
+#endif  // FXJS_XFA_CFXJSE_ISOLATETRACKER_H_
diff --git a/fxjs/cfxjse_resolveprocessor.cpp b/fxjs/xfa/cfxjse_resolveprocessor.cpp
similarity index 99%
rename from fxjs/cfxjse_resolveprocessor.cpp
rename to fxjs/xfa/cfxjse_resolveprocessor.cpp
index 0bc7e0c..e6fa74b 100644
--- a/fxjs/cfxjse_resolveprocessor.cpp
+++ b/fxjs/xfa/cfxjse_resolveprocessor.cpp
@@ -4,15 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fxjs/cfxjse_resolveprocessor.h"
+#include "fxjs/xfa/cfxjse_resolveprocessor.h"
 
 #include <algorithm>
 #include <utility>
 #include <vector>
 
 #include "core/fxcrt/fx_extension.h"
-#include "fxjs/cfxjse_engine.h"
-#include "fxjs/cfxjse_value.h"
+#include "fxjs/xfa/cfxjse_engine.h"
+#include "fxjs/xfa/cfxjse_value.h"
 #include "fxjs/xfa/cjx_object.h"
 #include "third_party/base/ptr_util.h"
 #include "third_party/base/stl_util.h"
diff --git a/fxjs/cfxjse_resolveprocessor.h b/fxjs/xfa/cfxjse_resolveprocessor.h
similarity index 94%
rename from fxjs/cfxjse_resolveprocessor.h
rename to fxjs/xfa/cfxjse_resolveprocessor.h
index 6a3cced..36e3a1c 100644
--- a/fxjs/cfxjse_resolveprocessor.h
+++ b/fxjs/xfa/cfxjse_resolveprocessor.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJS_CFXJSE_RESOLVEPROCESSOR_H_
-#define FXJS_CFXJSE_RESOLVEPROCESSOR_H_
+#ifndef FXJS_XFA_CFXJSE_RESOLVEPROCESSOR_H_
+#define FXJS_XFA_CFXJSE_RESOLVEPROCESSOR_H_
 
 #include <memory>
 #include <vector>
@@ -77,4 +77,4 @@
   std::unique_ptr<CXFA_NodeHelper> const m_pNodeHelper;
 };
 
-#endif  // FXJS_CFXJSE_RESOLVEPROCESSOR_H_
+#endif  // FXJS_XFA_CFXJSE_RESOLVEPROCESSOR_H_
diff --git a/fxjs/cfxjse_runtimedata.cpp b/fxjs/xfa/cfxjse_runtimedata.cpp
similarity index 95%
rename from fxjs/cfxjse_runtimedata.cpp
rename to fxjs/xfa/cfxjse_runtimedata.cpp
index 9db172d..fdff67a 100644
--- a/fxjs/cfxjse_runtimedata.cpp
+++ b/fxjs/xfa/cfxjse_runtimedata.cpp
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fxjs/cfxjse_runtimedata.h"
+#include "fxjs/xfa/cfxjse_runtimedata.h"
 
 #include <utility>
 
 #include "fxjs/cfxjs_engine.h"
-#include "fxjs/cfxjse_isolatetracker.h"
+#include "fxjs/xfa/cfxjse_isolatetracker.h"
 
 CFXJSE_RuntimeData::CFXJSE_RuntimeData() = default;
 
diff --git a/fxjs/cfxjse_runtimedata.h b/fxjs/xfa/cfxjse_runtimedata.h
similarity index 86%
rename from fxjs/cfxjse_runtimedata.h
rename to fxjs/xfa/cfxjse_runtimedata.h
index fb846a7..c0f5da3 100644
--- a/fxjs/cfxjse_runtimedata.h
+++ b/fxjs/xfa/cfxjse_runtimedata.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJS_CFXJSE_RUNTIMEDATA_H_
-#define FXJS_CFXJSE_RUNTIMEDATA_H_
+#ifndef FXJS_XFA_CFXJSE_RUNTIMEDATA_H_
+#define FXJS_XFA_CFXJSE_RUNTIMEDATA_H_
 
 #include <memory>
 
@@ -32,4 +32,4 @@
   CFXJSE_RuntimeData& operator=(const CFXJSE_RuntimeData&) = delete;
 };
 
-#endif  // FXJS_CFXJSE_RUNTIMEDATA_H_
+#endif  // FXJS_XFA_CFXJSE_RUNTIMEDATA_H_
diff --git a/fxjs/cfxjse_value.cpp b/fxjs/xfa/cfxjse_value.cpp
similarity index 98%
rename from fxjs/cfxjse_value.cpp
rename to fxjs/xfa/cfxjse_value.cpp
index 9f33e33..91f9fcd 100644
--- a/fxjs/cfxjse_value.cpp
+++ b/fxjs/xfa/cfxjse_value.cpp
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fxjs/cfxjse_value.h"
+#include "fxjs/xfa/cfxjse_value.h"
 
 #include <math.h>
 
-#include "fxjs/cfxjse_class.h"
-#include "fxjs/cfxjse_context.h"
-#include "fxjs/cfxjse_isolatetracker.h"
+#include "fxjs/xfa/cfxjse_class.h"
+#include "fxjs/xfa/cfxjse_context.h"
+#include "fxjs/xfa/cfxjse_isolatetracker.h"
 
 namespace {
 
@@ -485,4 +485,3 @@
           .ToLocalChecked();
   m_hValue.Reset(GetIsolate(), hValue);
 }
-
diff --git a/fxjs/cfxjse_value.h b/fxjs/xfa/cfxjse_value.h
similarity index 96%
rename from fxjs/cfxjse_value.h
rename to fxjs/xfa/cfxjse_value.h
index 55b214f..06c5cc2 100644
--- a/fxjs/cfxjse_value.h
+++ b/fxjs/xfa/cfxjse_value.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJS_CFXJSE_VALUE_H_
-#define FXJS_CFXJSE_VALUE_H_
+#ifndef FXJS_XFA_CFXJSE_VALUE_H_
+#define FXJS_XFA_CFXJSE_VALUE_H_
 
 #include <memory>
 #include <vector>
@@ -94,4 +94,4 @@
   v8::Global<v8::Value> m_hValue;
 };
 
-#endif  // FXJS_CFXJSE_VALUE_H_
+#endif  // FXJS_XFA_CFXJSE_VALUE_H_
diff --git a/fxjs/xfa/cjx_boolean.cpp b/fxjs/xfa/cjx_boolean.cpp
index c7650d1..efea115 100644
--- a/fxjs/xfa/cjx_boolean.cpp
+++ b/fxjs/xfa/cjx_boolean.cpp
@@ -6,7 +6,7 @@
 
 #include "fxjs/xfa/cjx_boolean.h"
 
-#include "fxjs/cfxjse_value.h"
+#include "fxjs/xfa/cfxjse_value.h"
 #include "xfa/fxfa/parser/cxfa_boolean.h"
 
 CJX_Boolean::CJX_Boolean(CXFA_Boolean* node) : CJX_Content(node) {}
diff --git a/fxjs/xfa/cjx_container.cpp b/fxjs/xfa/cjx_container.cpp
index 2a70bd6..515a5e2 100644
--- a/fxjs/xfa/cjx_container.cpp
+++ b/fxjs/xfa/cjx_container.cpp
@@ -8,9 +8,9 @@
 
 #include <vector>
 
-#include "fxjs/cfxjse_class.h"
-#include "fxjs/cfxjse_engine.h"
-#include "fxjs/cfxjse_value.h"
+#include "fxjs/xfa/cfxjse_class.h"
+#include "fxjs/xfa/cfxjse_engine.h"
+#include "fxjs/xfa/cfxjse_value.h"
 #include "xfa/fxfa/parser/cxfa_arraynodelist.h"
 #include "xfa/fxfa/parser/cxfa_document.h"
 #include "xfa/fxfa/parser/cxfa_field.h"
diff --git a/fxjs/xfa/cjx_content.cpp b/fxjs/xfa/cjx_content.cpp
index dd25829..68dda17 100644
--- a/fxjs/xfa/cjx_content.cpp
+++ b/fxjs/xfa/cjx_content.cpp
@@ -6,7 +6,7 @@
 
 #include "fxjs/xfa/cjx_content.h"
 
-#include "fxjs/cfxjse_value.h"
+#include "fxjs/xfa/cfxjse_value.h"
 #include "xfa/fxfa/parser/cxfa_object.h"
 
 CJX_Content::CJX_Content(CXFA_Object* obj) : CJX_Object(obj) {}
diff --git a/fxjs/xfa/cjx_datawindow.cpp b/fxjs/xfa/cjx_datawindow.cpp
index dbd672a..0c7f67d 100644
--- a/fxjs/xfa/cjx_datawindow.cpp
+++ b/fxjs/xfa/cjx_datawindow.cpp
@@ -8,7 +8,7 @@
 
 #include <vector>
 
-#include "fxjs/cfxjse_value.h"
+#include "fxjs/xfa/cfxjse_value.h"
 #include "xfa/fxfa/parser/cscript_datawindow.h"
 
 const CJX_MethodSpec CJX_DataWindow::MethodSpecs[] = {
diff --git a/fxjs/xfa/cjx_delta.cpp b/fxjs/xfa/cjx_delta.cpp
index edf17b9..5622bf9 100644
--- a/fxjs/xfa/cjx_delta.cpp
+++ b/fxjs/xfa/cjx_delta.cpp
@@ -8,8 +8,8 @@
 
 #include <vector>
 
-#include "fxjs/cfxjse_value.h"
 #include "fxjs/js_resources.h"
+#include "fxjs/xfa/cfxjse_value.h"
 #include "xfa/fxfa/parser/cxfa_delta.h"
 
 const CJX_MethodSpec CJX_Delta::MethodSpecs[] = {{"restore", restore_static}};
diff --git a/fxjs/xfa/cjx_desc.cpp b/fxjs/xfa/cjx_desc.cpp
index 1c84c68..b54a7ba 100644
--- a/fxjs/xfa/cjx_desc.cpp
+++ b/fxjs/xfa/cjx_desc.cpp
@@ -9,8 +9,8 @@
 #include <vector>
 
 #include "fxjs/cfx_v8.h"
-#include "fxjs/cfxjse_value.h"
 #include "fxjs/js_resources.h"
+#include "fxjs/xfa/cfxjse_value.h"
 #include "xfa/fxfa/parser/cxfa_desc.h"
 
 const CJX_MethodSpec CJX_Desc::MethodSpecs[] = {{"metadata", metadata_static}};
diff --git a/fxjs/xfa/cjx_draw.cpp b/fxjs/xfa/cjx_draw.cpp
index 8b9a2c0..9fae8f9 100644
--- a/fxjs/xfa/cjx_draw.cpp
+++ b/fxjs/xfa/cjx_draw.cpp
@@ -6,7 +6,7 @@
 
 #include "fxjs/xfa/cjx_draw.h"
 
-#include "fxjs/cfxjse_value.h"
+#include "fxjs/xfa/cfxjse_value.h"
 #include "xfa/fxfa/parser/cxfa_draw.h"
 
 CJX_Draw::CJX_Draw(CXFA_Draw* node) : CJX_Container(node) {}
diff --git a/fxjs/xfa/cjx_eventpseudomodel.cpp b/fxjs/xfa/cjx_eventpseudomodel.cpp
index 494681a..4fa58ed 100644
--- a/fxjs/xfa/cjx_eventpseudomodel.cpp
+++ b/fxjs/xfa/cjx_eventpseudomodel.cpp
@@ -9,8 +9,8 @@
 #include <algorithm>
 #include <vector>
 
-#include "fxjs/cfxjse_engine.h"
-#include "fxjs/cfxjse_value.h"
+#include "fxjs/xfa/cfxjse_engine.h"
+#include "fxjs/xfa/cfxjse_value.h"
 #include "xfa/fxfa/cxfa_eventparam.h"
 #include "xfa/fxfa/cxfa_ffnotify.h"
 #include "xfa/fxfa/cxfa_ffwidgethandler.h"
diff --git a/fxjs/xfa/cjx_exclgroup.cpp b/fxjs/xfa/cjx_exclgroup.cpp
index b6d01c2..5d71f0d 100644
--- a/fxjs/xfa/cjx_exclgroup.cpp
+++ b/fxjs/xfa/cjx_exclgroup.cpp
@@ -8,9 +8,9 @@
 
 #include <vector>
 
-#include "fxjs/cfxjse_engine.h"
-#include "fxjs/cfxjse_value.h"
 #include "fxjs/js_resources.h"
+#include "fxjs/xfa/cfxjse_engine.h"
+#include "fxjs/xfa/cfxjse_value.h"
 #include "xfa/fxfa/cxfa_eventparam.h"
 #include "xfa/fxfa/cxfa_ffnotify.h"
 #include "xfa/fxfa/fxfa.h"
diff --git a/fxjs/xfa/cjx_field.cpp b/fxjs/xfa/cjx_field.cpp
index a3c706c..c432ede 100644
--- a/fxjs/xfa/cjx_field.cpp
+++ b/fxjs/xfa/cjx_field.cpp
@@ -10,8 +10,8 @@
 
 #include "core/fxcrt/cfx_decimal.h"
 #include "fxjs/cfx_v8.h"
-#include "fxjs/cfxjse_value.h"
 #include "fxjs/js_resources.h"
+#include "fxjs/xfa/cfxjse_value.h"
 #include "xfa/fxfa/cxfa_eventparam.h"
 #include "xfa/fxfa/cxfa_ffnotify.h"
 #include "xfa/fxfa/fxfa.h"
diff --git a/fxjs/xfa/cjx_form.cpp b/fxjs/xfa/cjx_form.cpp
index a59edd0..a4d23e7 100644
--- a/fxjs/xfa/cjx_form.cpp
+++ b/fxjs/xfa/cjx_form.cpp
@@ -8,9 +8,9 @@
 
 #include <vector>
 
-#include "fxjs/cfxjse_engine.h"
-#include "fxjs/cfxjse_value.h"
 #include "fxjs/js_resources.h"
+#include "fxjs/xfa/cfxjse_engine.h"
+#include "fxjs/xfa/cfxjse_value.h"
 #include "xfa/fxfa/cxfa_eventparam.h"
 #include "xfa/fxfa/cxfa_ffnotify.h"
 #include "xfa/fxfa/parser/cxfa_arraynodelist.h"
diff --git a/fxjs/xfa/cjx_hostpseudomodel.cpp b/fxjs/xfa/cjx_hostpseudomodel.cpp
index 0c362ce..84e84b6 100644
--- a/fxjs/xfa/cjx_hostpseudomodel.cpp
+++ b/fxjs/xfa/cjx_hostpseudomodel.cpp
@@ -9,9 +9,9 @@
 #include <memory>
 #include <vector>
 
-#include "fxjs/cfxjse_engine.h"
-#include "fxjs/cfxjse_value.h"
 #include "fxjs/js_resources.h"
+#include "fxjs/xfa/cfxjse_engine.h"
+#include "fxjs/xfa/cfxjse_value.h"
 #include "xfa/fxfa/cxfa_ffdoc.h"
 #include "xfa/fxfa/cxfa_ffnotify.h"
 #include "xfa/fxfa/parser/cscript_hostpseudomodel.h"
diff --git a/fxjs/xfa/cjx_instancemanager.cpp b/fxjs/xfa/cjx_instancemanager.cpp
index b36fddc..4da4945 100644
--- a/fxjs/xfa/cjx_instancemanager.cpp
+++ b/fxjs/xfa/cjx_instancemanager.cpp
@@ -9,9 +9,9 @@
 #include <algorithm>
 #include <vector>
 
-#include "fxjs/cfxjse_engine.h"
-#include "fxjs/cfxjse_value.h"
 #include "fxjs/js_resources.h"
+#include "fxjs/xfa/cfxjse_engine.h"
+#include "fxjs/xfa/cfxjse_value.h"
 #include "xfa/fxfa/cxfa_ffdoc.h"
 #include "xfa/fxfa/cxfa_ffnotify.h"
 #include "xfa/fxfa/parser/cxfa_document.h"
diff --git a/fxjs/xfa/cjx_layoutpseudomodel.cpp b/fxjs/xfa/cjx_layoutpseudomodel.cpp
index 9fe8ddb..2342981 100644
--- a/fxjs/xfa/cjx_layoutpseudomodel.cpp
+++ b/fxjs/xfa/cjx_layoutpseudomodel.cpp
@@ -10,10 +10,10 @@
 #include <utility>
 
 #include "core/fxcrt/fx_coordinates.h"
-#include "fxjs/cfxjse_class.h"
-#include "fxjs/cfxjse_engine.h"
-#include "fxjs/cfxjse_value.h"
 #include "fxjs/js_resources.h"
+#include "fxjs/xfa/cfxjse_class.h"
+#include "fxjs/xfa/cfxjse_engine.h"
+#include "fxjs/xfa/cfxjse_value.h"
 #include "third_party/base/ptr_util.h"
 #include "third_party/base/stl_util.h"
 #include "xfa/fxfa/cxfa_ffnotify.h"
diff --git a/fxjs/xfa/cjx_list.cpp b/fxjs/xfa/cjx_list.cpp
index 6b4aa99..3c165e6 100644
--- a/fxjs/xfa/cjx_list.cpp
+++ b/fxjs/xfa/cjx_list.cpp
@@ -8,10 +8,10 @@
 
 #include <vector>
 
-#include "fxjs/cfxjse_class.h"
-#include "fxjs/cfxjse_engine.h"
-#include "fxjs/cfxjse_value.h"
 #include "fxjs/js_resources.h"
+#include "fxjs/xfa/cfxjse_class.h"
+#include "fxjs/xfa/cfxjse_engine.h"
+#include "fxjs/xfa/cfxjse_value.h"
 #include "third_party/base/numerics/safe_conversions.h"
 #include "xfa/fxfa/parser/cxfa_document.h"
 #include "xfa/fxfa/parser/cxfa_list.h"
diff --git a/fxjs/xfa/cjx_logpseudomodel.cpp b/fxjs/xfa/cjx_logpseudomodel.cpp
index 27d37ad..b1c1f1c 100644
--- a/fxjs/xfa/cjx_logpseudomodel.cpp
+++ b/fxjs/xfa/cjx_logpseudomodel.cpp
@@ -8,7 +8,7 @@
 
 #include <vector>
 
-#include "fxjs/cfxjse_value.h"
+#include "fxjs/xfa/cfxjse_value.h"
 #include "xfa/fxfa/parser/cscript_logpseudomodel.h"
 
 const CJX_MethodSpec CJX_LogPseudoModel::MethodSpecs[] = {
diff --git a/fxjs/xfa/cjx_manifest.cpp b/fxjs/xfa/cjx_manifest.cpp
index 555e6f2..f3837a5 100644
--- a/fxjs/xfa/cjx_manifest.cpp
+++ b/fxjs/xfa/cjx_manifest.cpp
@@ -9,8 +9,8 @@
 #include <vector>
 
 #include "fxjs/cfx_v8.h"
-#include "fxjs/cfxjse_value.h"
 #include "fxjs/js_resources.h"
+#include "fxjs/xfa/cfxjse_value.h"
 #include "xfa/fxfa/parser/cxfa_manifest.h"
 
 const CJX_MethodSpec CJX_Manifest::MethodSpecs[] = {
diff --git a/fxjs/xfa/cjx_model.cpp b/fxjs/xfa/cjx_model.cpp
index c9b6519..ef6ab66 100644
--- a/fxjs/xfa/cjx_model.cpp
+++ b/fxjs/xfa/cjx_model.cpp
@@ -8,9 +8,9 @@
 
 #include <vector>
 
-#include "fxjs/cfxjse_engine.h"
-#include "fxjs/cfxjse_value.h"
 #include "fxjs/js_resources.h"
+#include "fxjs/xfa/cfxjse_engine.h"
+#include "fxjs/xfa/cfxjse_value.h"
 #include "xfa/fxfa/parser/cxfa_delta.h"
 #include "xfa/fxfa/parser/cxfa_document.h"
 #include "xfa/fxfa/parser/xfa_basic_data.h"
diff --git a/fxjs/xfa/cjx_node.cpp b/fxjs/xfa/cjx_node.cpp
index d0ae0ea..d44bf63 100644
--- a/fxjs/xfa/cjx_node.cpp
+++ b/fxjs/xfa/cjx_node.cpp
@@ -14,9 +14,9 @@
 #include "core/fxcrt/fx_codepage.h"
 #include "core/fxcrt/xml/cfx_xmldocument.h"
 #include "core/fxcrt/xml/cfx_xmlnode.h"
-#include "fxjs/cfxjse_engine.h"
-#include "fxjs/cfxjse_value.h"
 #include "fxjs/js_resources.h"
+#include "fxjs/xfa/cfxjse_engine.h"
+#include "fxjs/xfa/cfxjse_value.h"
 #include "third_party/base/ptr_util.h"
 #include "xfa/fxfa/cxfa_eventparam.h"
 #include "xfa/fxfa/cxfa_ffdoc.h"
diff --git a/fxjs/xfa/cjx_object.cpp b/fxjs/xfa/cjx_object.cpp
index 7ecd25f..faaa0ec 100644
--- a/fxjs/xfa/cjx_object.cpp
+++ b/fxjs/xfa/cjx_object.cpp
@@ -12,9 +12,9 @@
 #include "core/fxcrt/fx_extension.h"
 #include "core/fxcrt/xml/cfx_xmlelement.h"
 #include "core/fxcrt/xml/cfx_xmltext.h"
-#include "fxjs/cfxjse_engine.h"
-#include "fxjs/cfxjse_value.h"
 #include "fxjs/cjs_result.h"
+#include "fxjs/xfa/cfxjse_engine.h"
+#include "fxjs/xfa/cfxjse_value.h"
 #include "fxjs/xfa/cjx_boolean.h"
 #include "fxjs/xfa/cjx_draw.h"
 #include "fxjs/xfa/cjx_field.h"
diff --git a/fxjs/xfa/cjx_occur.cpp b/fxjs/xfa/cjx_occur.cpp
index 9a8f47f..0b2f5ca 100644
--- a/fxjs/xfa/cjx_occur.cpp
+++ b/fxjs/xfa/cjx_occur.cpp
@@ -8,7 +8,7 @@
 
 #include <algorithm>
 
-#include "fxjs/cfxjse_value.h"
+#include "fxjs/xfa/cfxjse_value.h"
 #include "xfa/fxfa/parser/cxfa_occur.h"
 
 CJX_Occur::CJX_Occur(CXFA_Occur* node) : CJX_Node(node) {}
diff --git a/fxjs/xfa/cjx_packet.cpp b/fxjs/xfa/cjx_packet.cpp
index 87d67de..d91a286 100644
--- a/fxjs/xfa/cjx_packet.cpp
+++ b/fxjs/xfa/cjx_packet.cpp
@@ -12,8 +12,8 @@
 #include "core/fxcrt/xml/cfx_xmldocument.h"
 #include "core/fxcrt/xml/cfx_xmltext.h"
 #include "fxjs/cfx_v8.h"
-#include "fxjs/cfxjse_value.h"
 #include "fxjs/js_resources.h"
+#include "fxjs/xfa/cfxjse_value.h"
 #include "xfa/fxfa/cxfa_ffdoc.h"
 #include "xfa/fxfa/cxfa_ffnotify.h"
 #include "xfa/fxfa/parser/cxfa_packet.h"
diff --git a/fxjs/xfa/cjx_script.cpp b/fxjs/xfa/cjx_script.cpp
index 137e579..7c018a0 100644
--- a/fxjs/xfa/cjx_script.cpp
+++ b/fxjs/xfa/cjx_script.cpp
@@ -6,7 +6,7 @@
 
 #include "fxjs/xfa/cjx_script.h"
 
-#include "fxjs/cfxjse_value.h"
+#include "fxjs/xfa/cfxjse_value.h"
 #include "xfa/fxfa/parser/cxfa_script.h"
 
 CJX_Script::CJX_Script(CXFA_Script* node) : CJX_Node(node) {}
diff --git a/fxjs/xfa/cjx_signaturepseudomodel.cpp b/fxjs/xfa/cjx_signaturepseudomodel.cpp
index 1cda7c9..1a53506 100644
--- a/fxjs/xfa/cjx_signaturepseudomodel.cpp
+++ b/fxjs/xfa/cjx_signaturepseudomodel.cpp
@@ -9,8 +9,8 @@
 #include <vector>
 
 #include "fxjs/cfx_v8.h"
-#include "fxjs/cfxjse_value.h"
 #include "fxjs/js_resources.h"
+#include "fxjs/xfa/cfxjse_value.h"
 #include "xfa/fxfa/parser/cscript_signaturepseudomodel.h"
 
 const CJX_MethodSpec CJX_SignaturePseudoModel::MethodSpecs[] = {
diff --git a/fxjs/xfa/cjx_source.cpp b/fxjs/xfa/cjx_source.cpp
index 04417d5..5279dcd 100644
--- a/fxjs/xfa/cjx_source.cpp
+++ b/fxjs/xfa/cjx_source.cpp
@@ -8,8 +8,8 @@
 
 #include <vector>
 
-#include "fxjs/cfxjse_value.h"
 #include "fxjs/js_resources.h"
+#include "fxjs/xfa/cfxjse_value.h"
 #include "xfa/fxfa/parser/cxfa_source.h"
 
 const CJX_MethodSpec CJX_Source::MethodSpecs[] = {
diff --git a/fxjs/xfa/cjx_subform.cpp b/fxjs/xfa/cjx_subform.cpp
index 3d51625..b0c3654 100644
--- a/fxjs/xfa/cjx_subform.cpp
+++ b/fxjs/xfa/cjx_subform.cpp
@@ -9,8 +9,8 @@
 #include <vector>
 
 #include "fxjs/cfx_v8.h"
-#include "fxjs/cfxjse_value.h"
 #include "fxjs/js_resources.h"
+#include "fxjs/xfa/cfxjse_value.h"
 #include "xfa/fxfa/cxfa_eventparam.h"
 #include "xfa/fxfa/cxfa_ffnotify.h"
 #include "xfa/fxfa/fxfa.h"
diff --git a/fxjs/xfa/cjx_template.cpp b/fxjs/xfa/cjx_template.cpp
index fa0b979..7890f2e 100644
--- a/fxjs/xfa/cjx_template.cpp
+++ b/fxjs/xfa/cjx_template.cpp
@@ -9,8 +9,8 @@
 #include <vector>
 
 #include "fxjs/cfx_v8.h"
-#include "fxjs/cfxjse_value.h"
 #include "fxjs/js_resources.h"
+#include "fxjs/xfa/cfxjse_value.h"
 #include "xfa/fxfa/parser/cxfa_document.h"
 #include "xfa/fxfa/parser/cxfa_template.h"
 
diff --git a/fxjs/xfa/cjx_textnode.cpp b/fxjs/xfa/cjx_textnode.cpp
index fc3f592..4cdcb36 100644
--- a/fxjs/xfa/cjx_textnode.cpp
+++ b/fxjs/xfa/cjx_textnode.cpp
@@ -6,7 +6,7 @@
 
 #include "fxjs/xfa/cjx_textnode.h"
 
-#include "fxjs/cfxjse_value.h"
+#include "fxjs/xfa/cfxjse_value.h"
 #include "xfa/fxfa/parser/cxfa_node.h"
 
 CJX_TextNode::CJX_TextNode(CXFA_Node* node) : CJX_Node(node) {}
diff --git a/fxjs/xfa/cjx_tree.cpp b/fxjs/xfa/cjx_tree.cpp
index 3992127..f86f90d 100644
--- a/fxjs/xfa/cjx_tree.cpp
+++ b/fxjs/xfa/cjx_tree.cpp
@@ -8,9 +8,9 @@
 
 #include <vector>
 
-#include "fxjs/cfxjse_engine.h"
-#include "fxjs/cfxjse_value.h"
 #include "fxjs/js_resources.h"
+#include "fxjs/xfa/cfxjse_engine.h"
+#include "fxjs/xfa/cfxjse_value.h"
 #include "third_party/base/ptr_util.h"
 #include "xfa/fxfa/parser/cxfa_arraynodelist.h"
 #include "xfa/fxfa/parser/cxfa_attachnodelist.h"
diff --git a/fxjs/xfa/cjx_treelist.cpp b/fxjs/xfa/cjx_treelist.cpp
index acf5307..6b09c06 100644
--- a/fxjs/xfa/cjx_treelist.cpp
+++ b/fxjs/xfa/cjx_treelist.cpp
@@ -8,9 +8,9 @@
 
 #include <vector>
 
-#include "fxjs/cfxjse_engine.h"
-#include "fxjs/cfxjse_value.h"
 #include "fxjs/js_resources.h"
+#include "fxjs/xfa/cfxjse_engine.h"
+#include "fxjs/xfa/cfxjse_value.h"
 #include "xfa/fxfa/parser/cxfa_document.h"
 #include "xfa/fxfa/parser/cxfa_node.h"
 #include "xfa/fxfa/parser/cxfa_treelist.h"
diff --git a/fxjs/xfa/cjx_wsdlconnection.cpp b/fxjs/xfa/cjx_wsdlconnection.cpp
index 33c746a..bdb4ebf 100644
--- a/fxjs/xfa/cjx_wsdlconnection.cpp
+++ b/fxjs/xfa/cjx_wsdlconnection.cpp
@@ -9,8 +9,8 @@
 #include <vector>
 
 #include "fxjs/cfx_v8.h"
-#include "fxjs/cfxjse_value.h"
 #include "fxjs/js_resources.h"
+#include "fxjs/xfa/cfxjse_value.h"
 #include "xfa/fxfa/parser/cxfa_wsdlconnection.h"
 
 const CJX_MethodSpec CJX_WsdlConnection::MethodSpecs[] = {
diff --git a/fxjs/xfa/cjx_xfa.cpp b/fxjs/xfa/cjx_xfa.cpp
index 316f0c9..e7f0d2a 100644
--- a/fxjs/xfa/cjx_xfa.cpp
+++ b/fxjs/xfa/cjx_xfa.cpp
@@ -6,8 +6,8 @@
 
 #include "fxjs/xfa/cjx_xfa.h"
 
-#include "fxjs/cfxjse_engine.h"
-#include "fxjs/cfxjse_value.h"
+#include "fxjs/xfa/cfxjse_engine.h"
+#include "fxjs/xfa/cfxjse_value.h"
 #include "xfa/fxfa/parser/cxfa_document.h"
 #include "xfa/fxfa/parser/cxfa_xfa.h"
 
diff --git a/fxjs/fxjse.cpp b/fxjs/xfa/fxjse.cpp
similarity index 95%
rename from fxjs/fxjse.cpp
rename to fxjs/xfa/fxjse.cpp
index 44849fd..ff6176b 100644
--- a/fxjs/fxjse.cpp
+++ b/fxjs/xfa/fxjse.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fxjs/fxjse.h"
+#include "fxjs/xfa/fxjse.h"
 
 namespace pdfium {
 namespace fxjse {
diff --git a/fxjs/fxjse.h b/fxjs/xfa/fxjse.h
similarity index 96%
rename from fxjs/fxjse.h
rename to fxjs/xfa/fxjse.h
index 2171c23..6343fb7 100644
--- a/fxjs/fxjse.h
+++ b/fxjs/xfa/fxjse.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJS_FXJSE_H_
-#define FXJS_FXJSE_H_
+#ifndef FXJS_XFA_FXJSE_H_
+#define FXJS_XFA_FXJSE_H_
 
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
@@ -82,4 +82,4 @@
 
 void FXJSE_ThrowMessage(const ByteStringView& utf8Message);
 
-#endif  // FXJS_FXJSE_H_
+#endif  // FXJS_XFA_FXJSE_H_
diff --git a/testing/fuzzers/pdf_fm2js_fuzzer.cc b/testing/fuzzers/pdf_fm2js_fuzzer.cc
index 2541dfb..67daa46 100644
--- a/testing/fuzzers/pdf_fm2js_fuzzer.cc
+++ b/testing/fuzzers/pdf_fm2js_fuzzer.cc
@@ -8,7 +8,7 @@
 #include "core/fxcrt/cfx_widetextbuf.h"
 #include "core/fxcrt/fx_safe_types.h"
 #include "core/fxcrt/fx_string.h"
-#include "fxjs/cfxjse_formcalc_context.h"
+#include "fxjs/xfa/cfxjse_formcalc_context.h"
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
   FX_SAFE_SIZE_T safe_size = size;
diff --git a/testing/xfa_js_embedder_test.cpp b/testing/xfa_js_embedder_test.cpp
index 483d611..fc694a1 100644
--- a/testing/xfa_js_embedder_test.cpp
+++ b/testing/xfa_js_embedder_test.cpp
@@ -8,8 +8,8 @@
 
 #include "fpdfsdk/cpdfsdk_helpers.h"
 #include "fpdfsdk/fpdfxfa/cpdfxfa_context.h"
-#include "fxjs/cfxjse_engine.h"
-#include "fxjs/cfxjse_value.h"
+#include "fxjs/xfa/cfxjse_engine.h"
+#include "fxjs/xfa/cfxjse_value.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/base/ptr_util.h"
 #include "xfa/fxfa/cxfa_ffapp.h"
diff --git a/xfa/fxfa/cxfa_ffdocview.cpp b/xfa/fxfa/cxfa_ffdocview.cpp
index 9ca3ae8..985e4ce 100644
--- a/xfa/fxfa/cxfa_ffdocview.cpp
+++ b/xfa/fxfa/cxfa_ffdocview.cpp
@@ -7,7 +7,7 @@
 #include "xfa/fxfa/cxfa_ffdocview.h"
 
 #include "core/fxcrt/fx_extension.h"
-#include "fxjs/cfxjse_engine.h"
+#include "fxjs/xfa/cfxjse_engine.h"
 #include "fxjs/xfa/cjx_object.h"
 #include "third_party/base/ptr_util.h"
 #include "third_party/base/stl_util.h"
diff --git a/xfa/fxfa/cxfa_textprovider.cpp b/xfa/fxfa/cxfa_textprovider.cpp
index 943d9c4..9569589 100644
--- a/xfa/fxfa/cxfa_textprovider.cpp
+++ b/xfa/fxfa/cxfa_textprovider.cpp
@@ -12,8 +12,8 @@
 
 #include "core/fxcrt/xml/cfx_xmlelement.h"
 #include "core/fxcrt/xml/cfx_xmlnode.h"
-#include "fxjs/cfxjse_engine.h"
-#include "fxjs/cfxjse_value.h"
+#include "fxjs/xfa/cfxjse_engine.h"
+#include "fxjs/xfa/cfxjse_value.h"
 #include "fxjs/xfa/cjx_object.h"
 #include "xfa/fde/cfde_textout.h"
 #include "xfa/fxfa/cxfa_eventparam.h"
diff --git a/xfa/fxfa/parser/cxfa_document.cpp b/xfa/fxfa/parser/cxfa_document.cpp
index 577b8ee..052a316 100644
--- a/xfa/fxfa/parser/cxfa_document.cpp
+++ b/xfa/fxfa/parser/cxfa_document.cpp
@@ -11,7 +11,7 @@
 
 #include "core/fxcrt/fx_extension.h"
 #include "core/fxcrt/xml/cfx_xmldocument.h"
-#include "fxjs/cfxjse_engine.h"
+#include "fxjs/xfa/cfxjse_engine.h"
 #include "fxjs/xfa/cjx_object.h"
 #include "third_party/base/compiler_specific.h"
 #include "third_party/base/ptr_util.h"
diff --git a/xfa/fxfa/parser/cxfa_layoutpagemgr.cpp b/xfa/fxfa/parser/cxfa_layoutpagemgr.cpp
index 43e1182..fee62fd 100644
--- a/xfa/fxfa/parser/cxfa_layoutpagemgr.cpp
+++ b/xfa/fxfa/parser/cxfa_layoutpagemgr.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_layoutpagemgr.h"
 
-#include "fxjs/cfxjse_engine.h"
+#include "fxjs/xfa/cfxjse_engine.h"
 #include "fxjs/xfa/cjx_object.h"
 #include "third_party/base/stl_util.h"
 #include "xfa/fxfa/cxfa_ffnotify.h"
diff --git a/xfa/fxfa/parser/cxfa_list.cpp b/xfa/fxfa/parser/cxfa_list.cpp
index e2e755c..6329cec 100644
--- a/xfa/fxfa/parser/cxfa_list.cpp
+++ b/xfa/fxfa/parser/cxfa_list.cpp
@@ -9,7 +9,7 @@
 #include <utility>
 
 #include "core/fxcrt/fx_extension.h"
-#include "fxjs/cfxjse_engine.h"
+#include "fxjs/xfa/cfxjse_engine.h"
 #include "fxjs/xfa/cjx_treelist.h"
 #include "xfa/fxfa/parser/cxfa_document.h"
 #include "xfa/fxfa/parser/cxfa_node.h"
diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp
index 73e6be7..3c29bf7 100644
--- a/xfa/fxfa/parser/cxfa_node.cpp
+++ b/xfa/fxfa/parser/cxfa_node.cpp
@@ -24,8 +24,8 @@
 #include "core/fxcrt/xml/cfx_xmlnode.h"
 #include "core/fxcrt/xml/cfx_xmltext.h"
 #include "core/fxge/dib/cfx_dibitmap.h"
-#include "fxjs/cfxjse_engine.h"
-#include "fxjs/cfxjse_value.h"
+#include "fxjs/xfa/cfxjse_engine.h"
+#include "fxjs/xfa/cfxjse_value.h"
 #include "fxjs/xfa/cjx_node.h"
 #include "third_party/base/compiler_specific.h"
 #include "third_party/base/logging.h"
diff --git a/xfa/fxfa/parser/cxfa_nodehelper.cpp b/xfa/fxfa/parser/cxfa_nodehelper.cpp
index 2bf1f70..caf3bdb 100644
--- a/xfa/fxfa/parser/cxfa_nodehelper.cpp
+++ b/xfa/fxfa/parser/cxfa_nodehelper.cpp
@@ -9,7 +9,7 @@
 #include <utility>
 
 #include "core/fxcrt/fx_extension.h"
-#include "fxjs/cfxjse_engine.h"
+#include "fxjs/xfa/cfxjse_engine.h"
 #include "fxjs/xfa/cjx_object.h"
 #include "xfa/fxfa/parser/cxfa_document.h"
 #include "xfa/fxfa/parser/cxfa_localemgr.h"
diff --git a/xfa/fxfa/parser/cxfa_object.cpp b/xfa/fxfa/parser/cxfa_object.cpp
index b898f7a..38cc41d 100644
--- a/xfa/fxfa/parser/cxfa_object.cpp
+++ b/xfa/fxfa/parser/cxfa_object.cpp
@@ -9,8 +9,8 @@
 #include <utility>
 
 #include "core/fxcrt/fx_extension.h"
-#include "fxjs/cfxjse_engine.h"
-#include "fxjs/cfxjse_value.h"
+#include "fxjs/xfa/cfxjse_engine.h"
+#include "fxjs/xfa/cfxjse_value.h"
 #include "fxjs/xfa/cjx_object.h"
 #include "xfa/fxfa/cxfa_ffnotify.h"
 #include "xfa/fxfa/parser/cxfa_document.h"
diff --git a/xfa/fxfa/parser/cxfa_object.h b/xfa/fxfa/parser/cxfa_object.h
index 71a2d1d..a36531f 100644
--- a/xfa/fxfa/parser/cxfa_object.h
+++ b/xfa/fxfa/parser/cxfa_object.h
@@ -10,7 +10,7 @@
 #include <memory>
 
 #include "core/fxcrt/fx_string.h"
-#include "fxjs/fxjse.h"
+#include "fxjs/xfa/fxjse.h"
 #include "xfa/fxfa/fxfa_basic.h"
 
 enum class XFA_ObjectType {