132 files changed, 833 insertions, 851 deletions

diff --git a/xfa/include/fxfa/fxfa_objectacc.h b/xfa/include/fxfa/fxfa_objectacc.h
index f5cc5abf35..7938b2ef2d 100644
--- a/xfa/include/fxfa/fxfa_objectacc.h
+++ b/xfa/include/fxfa/fxfa_objectacc.h
@@ -8,7 +8,7 @@
 #define XFA_INCLUDE_FXFA_FXFA_OBJECTACC_H_
 
 #include "core/include/fxge/fx_dib.h"
-#include "xfa/src/fxfa/src/common/xfa_object.h"
+#include "xfa/src/fxfa/parser/xfa_object.h"
 
 class CXFA_Node;
 class IFX_Locale;
diff --git a/xfa/src/fxfa/src/app/xfa_checksum.cpp b/xfa/src/fxfa/app/xfa_checksum.cpp
index 3d6f1a7175..781a30f798 100644
--- a/xfa/src/fxfa/src/app/xfa_checksum.cpp
+++ b/xfa/src/fxfa/app/xfa_checksum.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/app/xfa_checksum.h"
+#include "xfa/src/fxfa/app/xfa_checksum.h"
 
 #include "core/include/fdrm/fx_crypt.h"
 #include "xfa/src/fgas/include/fx_alg.h"
diff --git a/xfa/src/fxfa/src/app/xfa_checksum.h b/xfa/src/fxfa/app/xfa_checksum.h
index 16e634d877..a02ef311c6 100644
--- a/xfa/src/fxfa/src/app/xfa_checksum.h
+++ b/xfa/src/fxfa/app/xfa_checksum.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_APP_XFA_CHECKSUM_H_
-#define XFA_SRC_FXFA_SRC_APP_XFA_CHECKSUM_H_
+#ifndef XFA_SRC_FXFA_APP_XFA_CHECKSUM_H_
+#define XFA_SRC_FXFA_APP_XFA_CHECKSUM_H_
 
 #include "xfa/include/fxfa/fxfa.h"
 #include "xfa/src/fgas/include/fx_sax.h"
@@ -70,4 +70,4 @@ class CXFA_ChecksumContext : public IXFA_ChecksumContext {
   CFX_ByteString m_bsChecksum;
 };
 
-#endif  // XFA_SRC_FXFA_SRC_APP_XFA_CHECKSUM_H_
+#endif  // XFA_SRC_FXFA_APP_XFA_CHECKSUM_H_
diff --git a/xfa/src/fxfa/src/app/xfa_ffapp.cpp b/xfa/src/fxfa/app/xfa_ffapp.cpp
index 49478e0d23..d37eaf5b83 100644
--- a/xfa/src/fxfa/src/app/xfa_ffapp.cpp
+++ b/xfa/src/fxfa/app/xfa_ffapp.cpp
@@ -4,17 +4,17 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
+#include "xfa/src/fxfa/app/xfa_ffapp.h"
 
 #include <algorithm>
 
 #include "xfa/include/fwl/core/fwl_widgetmgr.h"
-#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
-#include "xfa/src/fxfa/src/app/xfa_ffdochandler.h"
-#include "xfa/src/fxfa/src/app/xfa_ffwidgethandler.h"
-#include "xfa/src/fxfa/src/app/xfa_fontmgr.h"
-#include "xfa/src/fxfa/src/app/xfa_fwladapter.h"
-#include "xfa/src/fxfa/src/app/xfa_fwltheme.h"
+#include "xfa/src/fxfa/app/xfa_ffdoc.h"
+#include "xfa/src/fxfa/app/xfa_ffdochandler.h"
+#include "xfa/src/fxfa/app/xfa_ffwidgethandler.h"
+#include "xfa/src/fxfa/app/xfa_fontmgr.h"
+#include "xfa/src/fxfa/app/xfa_fwladapter.h"
+#include "xfa/src/fxfa/app/xfa_fwltheme.h"
 
 CXFA_FileRead::CXFA_FileRead(const CFX_ArrayTemplate<CPDF_Stream*>& streams) {
   int32_t iCount = streams.GetSize();
diff --git a/xfa/src/fxfa/src/app/xfa_ffapp.h b/xfa/src/fxfa/app/xfa_ffapp.h
index 12d6c34abd..4d4332aa5e 100644
--- a/xfa/src/fxfa/src/app/xfa_ffapp.h
+++ b/xfa/src/fxfa/app/xfa_ffapp.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFAPP_H_
-#define XFA_SRC_FXFA_SRC_APP_XFA_FFAPP_H_
+#ifndef XFA_SRC_FXFA_APP_XFA_FFAPP_H_
+#define XFA_SRC_FXFA_APP_XFA_FFAPP_H_
 
 #include "core/include/fpdfapi/fpdf_objects.h"
 #include "xfa/include/fwl/adapter/fwl_adapternative.h"
@@ -78,4 +78,4 @@ class CXFA_FFApp : public IXFA_App, public IFWL_AdapterNative {
   CFWL_SDAdapterThreadMgr* m_pAdapterThreadMgr;
 };
 
-#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFAPP_H_
+#endif  // XFA_SRC_FXFA_APP_XFA_FFAPP_H_
diff --git a/xfa/src/fxfa/src/app/xfa_ffbarcode.cpp b/xfa/src/fxfa/app/xfa_ffbarcode.cpp
index 3a228de203..e1d4aa11c1 100644
--- a/xfa/src/fxfa/src/app/xfa_ffbarcode.cpp
+++ b/xfa/src/fxfa/app/xfa_ffbarcode.cpp
@@ -4,16 +4,16 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/app/xfa_ffbarcode.h"
+#include "xfa/src/fxfa/app/xfa_ffbarcode.h"
 
 #include "core/include/fxcrt/fx_ext.h"
 #include "xfa/include/fwl/core/fwl_app.h"
 #include "xfa/include/fwl/lightwidget/barcode.h"
-#include "xfa/src/fxfa/src/app/xfa_fffield.h"
-#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
-#include "xfa/src/fxfa/src/app/xfa_fftextedit.h"
-#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
-#include "xfa/src/fxfa/src/app/xfa_fwladapter.h"
+#include "xfa/src/fxfa/app/xfa_fffield.h"
+#include "xfa/src/fxfa/app/xfa_ffpageview.h"
+#include "xfa/src/fxfa/app/xfa_fftextedit.h"
+#include "xfa/src/fxfa/app/xfa_ffwidget.h"
+#include "xfa/src/fxfa/app/xfa_fwladapter.h"
 
 static XFA_LPCBARCODETYPEENUMINFO XFA_GetBarcodeTypeByName(
     const CFX_WideStringC& wsName);
diff --git a/xfa/src/fxfa/src/app/xfa_ffbarcode.h b/xfa/src/fxfa/app/xfa_ffbarcode.h
index bf740b11f7..d2f8058296 100644
--- a/xfa/src/fxfa/src/app/xfa_ffbarcode.h
+++ b/xfa/src/fxfa/app/xfa_ffbarcode.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFBARCODE_H_
-#define XFA_SRC_FXFA_SRC_APP_XFA_FFBARCODE_H_
+#ifndef XFA_SRC_FXFA_APP_XFA_FFBARCODE_H_
+#define XFA_SRC_FXFA_APP_XFA_FFBARCODE_H_
 
 #include "xfa/include/fxbarcode/BC_BarCode.h"
-#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
-#include "xfa/src/fxfa/src/app/xfa_fftextedit.h"
+#include "xfa/src/fxfa/app/xfa_ffpageview.h"
+#include "xfa/src/fxfa/app/xfa_fftextedit.h"
 
 class CXFA_FFBarcode : public CXFA_FFTextEdit {
  public:
@@ -98,4 +98,4 @@ struct XFA_BARCODETYPEENUMINFO {
 typedef XFA_BARCODETYPEENUMINFO const* XFA_LPCBARCODETYPEENUMINFO;
 extern const XFA_BARCODETYPEENUMINFO g_XFABarCodeTypeEnumData[];
 
-#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFBARCODE_H_
+#endif  // XFA_SRC_FXFA_APP_XFA_FFBARCODE_H_
diff --git a/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp b/xfa/src/fxfa/app/xfa_ffcheckbutton.cpp
index 33e9abf496..e5a6e809c4 100644
--- a/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp
+++ b/xfa/src/fxfa/app/xfa_ffcheckbutton.cpp
@@ -4,17 +4,17 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/app/xfa_ffcheckbutton.h"
+#include "xfa/src/fxfa/app/xfa_ffcheckbutton.h"
 
 #include "xfa/include/fwl/core/fwl_widgetmgr.h"
 #include "xfa/include/fwl/lightwidget/checkbox.h"
-#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
-#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
-#include "xfa/src/fxfa/src/app/xfa_ffdocview.h"
-#include "xfa/src/fxfa/src/app/xfa_ffexclgroup.h"
-#include "xfa/src/fxfa/src/app/xfa_fffield.h"
-#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
-#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
+#include "xfa/src/fxfa/app/xfa_ffapp.h"
+#include "xfa/src/fxfa/app/xfa_ffdoc.h"
+#include "xfa/src/fxfa/app/xfa_ffdocview.h"
+#include "xfa/src/fxfa/app/xfa_ffexclgroup.h"
+#include "xfa/src/fxfa/app/xfa_fffield.h"
+#include "xfa/src/fxfa/app/xfa_ffpageview.h"
+#include "xfa/src/fxfa/app/xfa_ffwidget.h"
 
 CXFA_FFCheckButton::CXFA_FFCheckButton(CXFA_FFPageView* pPageView,
                                        CXFA_WidgetAcc* pDataAcc)
diff --git a/xfa/src/fxfa/src/app/xfa_ffcheckbutton.h b/xfa/src/fxfa/app/xfa_ffcheckbutton.h
index 0d482b1c3f..9731d4d53b 100644
--- a/xfa/src/fxfa/src/app/xfa_ffcheckbutton.h
+++ b/xfa/src/fxfa/app/xfa_ffcheckbutton.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFCHECKBUTTON_H_
-#define XFA_SRC_FXFA_SRC_APP_XFA_FFCHECKBUTTON_H_
+#ifndef XFA_SRC_FXFA_APP_XFA_FFCHECKBUTTON_H_
+#define XFA_SRC_FXFA_APP_XFA_FFCHECKBUTTON_H_
 
-#include "xfa/src/fxfa/src/app/xfa_fffield.h"
-#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
+#include "xfa/src/fxfa/app/xfa_fffield.h"
+#include "xfa/src/fxfa/app/xfa_ffpageview.h"
 
 class CXFA_FFCheckButton : public CXFA_FFField {
  public:
@@ -40,4 +40,4 @@ class CXFA_FFCheckButton : public CXFA_FFField {
   CFX_RectF m_rtCheckBox;
 };
 
-#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFCHECKBUTTON_H_
+#endif  // XFA_SRC_FXFA_APP_XFA_FFCHECKBUTTON_H_
diff --git a/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp b/xfa/src/fxfa/app/xfa_ffchoicelist.cpp
index e3ac41aa65..cb481f56a4 100644
--- a/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp
+++ b/xfa/src/fxfa/app/xfa_ffchoicelist.cpp
@@ -4,18 +4,18 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/app/xfa_ffchoicelist.h"
+#include "xfa/src/fxfa/app/xfa_ffchoicelist.h"
 
 #include "xfa/include/fwl/basewidget/fwl_edit.h"
 #include "xfa/include/fwl/core/fwl_app.h"
 #include "xfa/include/fwl/lightwidget/combobox.h"
 #include "xfa/include/fwl/lightwidget/listbox.h"
-#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
-#include "xfa/src/fxfa/src/app/xfa_ffdocview.h"
-#include "xfa/src/fxfa/src/app/xfa_fffield.h"
-#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
-#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
-#include "xfa/src/fxfa/src/app/xfa_fwladapter.h"
+#include "xfa/src/fxfa/app/xfa_ffdoc.h"
+#include "xfa/src/fxfa/app/xfa_ffdocview.h"
+#include "xfa/src/fxfa/app/xfa_fffield.h"
+#include "xfa/src/fxfa/app/xfa_ffpageview.h"
+#include "xfa/src/fxfa/app/xfa_ffwidget.h"
+#include "xfa/src/fxfa/app/xfa_fwladapter.h"
 
 CXFA_FFListBox::CXFA_FFListBox(CXFA_FFPageView* pPageView,
                                CXFA_WidgetAcc* pDataAcc)
diff --git a/xfa/src/fxfa/src/app/xfa_ffchoicelist.h b/xfa/src/fxfa/app/xfa_ffchoicelist.h
index ef2de65ab4..781360f8ad 100644
--- a/xfa/src/fxfa/src/app/xfa_ffchoicelist.h
+++ b/xfa/src/fxfa/app/xfa_ffchoicelist.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFCHOICELIST_H_
-#define XFA_SRC_FXFA_SRC_APP_XFA_FFCHOICELIST_H_
+#ifndef XFA_SRC_FXFA_APP_XFA_FFCHOICELIST_H_
+#define XFA_SRC_FXFA_APP_XFA_FFCHOICELIST_H_
 
-#include "xfa/src/fxfa/src/app/xfa_fffield.h"
-#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
+#include "xfa/src/fxfa/app/xfa_fffield.h"
+#include "xfa/src/fxfa/app/xfa_ffpageview.h"
 
 class CXFA_FFListBox : public CXFA_FFField {
  public:
@@ -93,4 +93,4 @@ class CXFA_FFComboBox : public CXFA_FFField {
   IFWL_WidgetDelegate* m_pOldDelegate;
 };
 
-#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFCHOICELIST_H_
+#endif  // XFA_SRC_FXFA_APP_XFA_FFCHOICELIST_H_
diff --git a/xfa/src/fxfa/src/app/xfa_ffdoc.cpp b/xfa/src/fxfa/app/xfa_ffdoc.cpp
index 1f04d7e560..f088a79fb6 100644
--- a/xfa/src/fxfa/src/app/xfa_ffdoc.cpp
+++ b/xfa/src/fxfa/app/xfa_ffdoc.cpp
@@ -4,19 +4,19 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
+#include "xfa/src/fxfa/app/xfa_ffdoc.h"
 
 #include "core/include/fpdfdoc/fpdf_doc.h"
 #include "core/include/fxcrt/fx_ext.h"
 #include "xfa/include/fwl/core/fwl_note.h"
 #include "xfa/src/fgas/include/fx_alg.h"
-#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
-#include "xfa/src/fxfa/src/app/xfa_ffdocview.h"
-#include "xfa/src/fxfa/src/app/xfa_ffnotify.h"
-#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
-#include "xfa/src/fxfa/src/app/xfa_fontmgr.h"
-#include "xfa/src/fxfa/src/common/xfa_docdata.h"
-#include "xfa/src/fxfa/src/common/xfa_parser.h"
+#include "xfa/src/fxfa/app/xfa_ffapp.h"
+#include "xfa/src/fxfa/app/xfa_ffdocview.h"
+#include "xfa/src/fxfa/app/xfa_ffnotify.h"
+#include "xfa/src/fxfa/app/xfa_ffwidget.h"
+#include "xfa/src/fxfa/app/xfa_fontmgr.h"
+#include "xfa/src/fxfa/parser/xfa_docdata.h"
+#include "xfa/src/fxfa/parser/xfa_parser.h"
 
 CXFA_FFDoc::CXFA_FFDoc(CXFA_FFApp* pApp, IXFA_DocProvider* pDocProvider)
     : m_pDocProvider(pDocProvider),
@@ -26,8 +26,7 @@ CXFA_FFDoc::CXFA_FFDoc(CXFA_FFApp* pApp, IXFA_DocProvider* pDocProvider)
       m_pNotify(nullptr),
       m_pPDFDoc(nullptr),
       m_dwDocType(XFA_DOCTYPE_Static),
-      m_bOwnStream(TRUE) {
-}
+      m_bOwnStream(TRUE) {}
 CXFA_FFDoc::~CXFA_FFDoc() {
   CloseDoc();
 }
diff --git a/xfa/src/fxfa/src/app/xfa_ffdoc.h b/xfa/src/fxfa/app/xfa_ffdoc.h
index 74c202eb8b..c5980138aa 100644
--- a/xfa/src/fxfa/src/app/xfa_ffdoc.h
+++ b/xfa/src/fxfa/app/xfa_ffdoc.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFDOC_H_
-#define XFA_SRC_FXFA_SRC_APP_XFA_FFDOC_H_
+#ifndef XFA_SRC_FXFA_APP_XFA_FFDOC_H_
+#define XFA_SRC_FXFA_APP_XFA_FFDOC_H_
 
 #include "xfa/include/fxfa/fxfa.h"
-#include "xfa/src/fxfa/src/common/xfa_document.h"
+#include "xfa/src/fxfa/parser/xfa_document.h"
 
 class CXFA_FFApp;
 class CXFA_FFNotify;
@@ -61,4 +61,4 @@ class CXFA_FFDoc : public IXFA_Doc {
   FX_BOOL m_bOwnStream;
 };
 
-#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFDOC_H_
+#endif  // XFA_SRC_FXFA_APP_XFA_FFDOC_H_
diff --git a/xfa/src/fxfa/src/app/xfa_ffdochandler.cpp b/xfa/src/fxfa/app/xfa_ffdochandler.cpp
index 2f636b63ef..f2473659ec 100644
--- a/xfa/src/fxfa/src/app/xfa_ffdochandler.cpp
+++ b/xfa/src/fxfa/app/xfa_ffdochandler.cpp
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/app/xfa_ffdochandler.h"
+#include "xfa/src/fxfa/app/xfa_ffdochandler.h"
 
-#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
-#include "xfa/src/fxfa/src/common/xfa_script.h"
+#include "xfa/src/fxfa/app/xfa_ffdoc.h"
+#include "xfa/src/fxfa/parser/xfa_script.h"
 
 CXFA_FFDocHandler::CXFA_FFDocHandler() {}
 CXFA_FFDocHandler::~CXFA_FFDocHandler() {}
diff --git a/xfa/src/fxfa/src/app/xfa_ffdochandler.h b/xfa/src/fxfa/app/xfa_ffdochandler.h
index 216df72b6f..e324bff81d 100644
--- a/xfa/src/fxfa/src/app/xfa_ffdochandler.h
+++ b/xfa/src/fxfa/app/xfa_ffdochandler.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFDOCHANDLER_H_
-#define XFA_SRC_FXFA_SRC_APP_XFA_FFDOCHANDLER_H_
+#ifndef XFA_SRC_FXFA_APP_XFA_FFDOCHANDLER_H_
+#define XFA_SRC_FXFA_APP_XFA_FFDOCHANDLER_H_
 
 #include "xfa/include/fxfa/fxfa.h"
 
@@ -47,4 +47,4 @@ class CXFA_FFDocHandler : public IXFA_DocHandler {
  protected:
 };
 
-#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFDOCHANDLER_H_
+#endif  // XFA_SRC_FXFA_APP_XFA_FFDOCHANDLER_H_
diff --git a/xfa/src/fxfa/src/app/xfa_ffdocview.cpp b/xfa/src/fxfa/app/xfa_ffdocview.cpp
index 1bb504ed3c..3c94a69d87 100644
--- a/xfa/src/fxfa/src/app/xfa_ffdocview.cpp
+++ b/xfa/src/fxfa/app/xfa_ffdocview.cpp
@@ -4,32 +4,32 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/app/xfa_ffdocview.h"
+#include "xfa/src/fxfa/app/xfa_ffdocview.h"
 
 #include "core/include/fxcrt/fx_ext.h"
-#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
-#include "xfa/src/fxfa/src/app/xfa_ffbarcode.h"
-#include "xfa/src/fxfa/src/app/xfa_ffcheckbutton.h"
-#include "xfa/src/fxfa/src/app/xfa_ffchoicelist.h"
-#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
-#include "xfa/src/fxfa/src/app/xfa_ffdraw.h"
-#include "xfa/src/fxfa/src/app/xfa_ffexclgroup.h"
-#include "xfa/src/fxfa/src/app/xfa_fffield.h"
-#include "xfa/src/fxfa/src/app/xfa_ffimage.h"
-#include "xfa/src/fxfa/src/app/xfa_ffimageedit.h"
-#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
-#include "xfa/src/fxfa/src/app/xfa_ffpath.h"
-#include "xfa/src/fxfa/src/app/xfa_ffpushbutton.h"
-#include "xfa/src/fxfa/src/app/xfa_ffsignature.h"
-#include "xfa/src/fxfa/src/app/xfa_ffsubform.h"
-#include "xfa/src/fxfa/src/app/xfa_fftext.h"
-#include "xfa/src/fxfa/src/app/xfa_fftextedit.h"
-#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
-#include "xfa/src/fxfa/src/app/xfa_ffwidgetacc.h"
-#include "xfa/src/fxfa/src/app/xfa_ffwidgethandler.h"
-#include "xfa/src/fxfa/src/app/xfa_fwladapter.h"
-#include "xfa/src/fxfa/src/app/xfa_textlayout.h"
-#include "xfa/src/fxfa/src/common/xfa_script.h"
+#include "xfa/src/fxfa/app/xfa_ffapp.h"
+#include "xfa/src/fxfa/app/xfa_ffbarcode.h"
+#include "xfa/src/fxfa/app/xfa_ffcheckbutton.h"
+#include "xfa/src/fxfa/app/xfa_ffchoicelist.h"
+#include "xfa/src/fxfa/app/xfa_ffdoc.h"
+#include "xfa/src/fxfa/app/xfa_ffdraw.h"
+#include "xfa/src/fxfa/app/xfa_ffexclgroup.h"
+#include "xfa/src/fxfa/app/xfa_fffield.h"
+#include "xfa/src/fxfa/app/xfa_ffimage.h"
+#include "xfa/src/fxfa/app/xfa_ffimageedit.h"
+#include "xfa/src/fxfa/app/xfa_ffpageview.h"
+#include "xfa/src/fxfa/app/xfa_ffpath.h"
+#include "xfa/src/fxfa/app/xfa_ffpushbutton.h"
+#include "xfa/src/fxfa/app/xfa_ffsignature.h"
+#include "xfa/src/fxfa/app/xfa_ffsubform.h"
+#include "xfa/src/fxfa/app/xfa_fftext.h"
+#include "xfa/src/fxfa/app/xfa_fftextedit.h"
+#include "xfa/src/fxfa/app/xfa_ffwidget.h"
+#include "xfa/src/fxfa/app/xfa_ffwidgetacc.h"
+#include "xfa/src/fxfa/app/xfa_ffwidgethandler.h"
+#include "xfa/src/fxfa/app/xfa_fwladapter.h"
+#include "xfa/src/fxfa/app/xfa_textlayout.h"
+#include "xfa/src/fxfa/parser/xfa_script.h"
 
 extern const XFA_ATTRIBUTEENUM gs_EventActivity[] = {
     XFA_ATTRIBUTEENUM_Click,      XFA_ATTRIBUTEENUM_Change,
@@ -58,8 +58,7 @@ CXFA_FFDocView::CXFA_FFDocView(CXFA_FFDoc* pDoc)
       m_pFocusWidget(nullptr),
       m_pOldFocusWidget(nullptr),
       m_iStatus(XFA_DOCVIEW_LAYOUTSTATUS_None),
-      m_iLock(0) {
-}
+      m_iLock(0) {}
 CXFA_FFDocView::~CXFA_FFDocView() {
   DestroyDocView();
   if (m_pWidgetHandler) {
@@ -538,9 +537,9 @@ void CXFA_FFDocView::OnPageEvent(IXFA_LayoutPage* pSender,
                                  int32_t iPageIndex) {
   CXFA_FFPageView* pFFPageView = static_cast<CXFA_FFPageView*>(pSender);
   if (eEvent == XFA_PAGEEVENT_PageRemoved) {
-      m_pDoc->GetDocProvider()->PageViewEvent(pFFPageView,
-                                              XFA_PAGEVIEWEVENT_PostRemoved);
-      return;
+    m_pDoc->GetDocProvider()->PageViewEvent(pFFPageView,
+                                            XFA_PAGEVIEWEVENT_PostRemoved);
+    return;
   }
   m_pDoc->GetDocProvider()->PageViewEvent(pFFPageView,
                                           XFA_PAGEVIEWEVENT_PostAdded);
diff --git a/xfa/src/fxfa/src/app/xfa_ffdocview.h b/xfa/src/fxfa/app/xfa_ffdocview.h
index 6044aa54f5..6ca9d2d015 100644
--- a/xfa/src/fxfa/src/app/xfa_ffdocview.h
+++ b/xfa/src/fxfa/app/xfa_ffdocview.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFDOCVIEW_H_
-#define XFA_SRC_FXFA_SRC_APP_XFA_FFDOCVIEW_H_
+#ifndef XFA_SRC_FXFA_APP_XFA_FFDOCVIEW_H_
+#define XFA_SRC_FXFA_APP_XFA_FFDOCVIEW_H_
 
-#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
+#include "xfa/src/fxfa/app/xfa_ffdoc.h"
 
 class CXFA_FFWidgetHandler;
 class CXFA_FFDoc;
@@ -167,4 +167,4 @@ class CXFA_WidgetAccIterator : public IXFA_WidgetAccIterator {
   CXFA_WidgetAcc* m_pCurWidgetAcc;
 };
 
-#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFDOCVIEW_H_
+#endif  // XFA_SRC_FXFA_APP_XFA_FFDOCVIEW_H_
diff --git a/xfa/src/fxfa/src/app/xfa_ffdraw.cpp b/xfa/src/fxfa/app/xfa_ffdraw.cpp
index 4f575cb991..e3be99b5ec 100644
--- a/xfa/src/fxfa/src/app/xfa_ffdraw.cpp
+++ b/xfa/src/fxfa/app/xfa_ffdraw.cpp
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/app/xfa_ffdraw.h"
+#include "xfa/src/fxfa/app/xfa_ffdraw.h"
 
-#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
-#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
-#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
-#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
+#include "xfa/src/fxfa/app/xfa_ffapp.h"
+#include "xfa/src/fxfa/app/xfa_ffdoc.h"
+#include "xfa/src/fxfa/app/xfa_ffpageview.h"
+#include "xfa/src/fxfa/app/xfa_ffwidget.h"
 
 CXFA_FFDraw::CXFA_FFDraw(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc)
     : CXFA_FFWidget(pPageView, pDataAcc) {}
diff --git a/xfa/src/fxfa/src/app/xfa_ffdraw.h b/xfa/src/fxfa/app/xfa_ffdraw.h
index 24862e5180..467c0728cc 100644
--- a/xfa/src/fxfa/src/app/xfa_ffdraw.h
+++ b/xfa/src/fxfa/app/xfa_ffdraw.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFDRAW_H_
-#define XFA_SRC_FXFA_SRC_APP_XFA_FFDRAW_H_
+#ifndef XFA_SRC_FXFA_APP_XFA_FFDRAW_H_
+#define XFA_SRC_FXFA_APP_XFA_FFDRAW_H_
 
-#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
-#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
+#include "xfa/src/fxfa/app/xfa_ffpageview.h"
+#include "xfa/src/fxfa/app/xfa_ffwidget.h"
 
 class CXFA_FFDraw : public CXFA_FFWidget {
  public:
@@ -16,4 +16,4 @@ class CXFA_FFDraw : public CXFA_FFWidget {
   virtual ~CXFA_FFDraw();
 };
 
-#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFDRAW_H_
+#endif  // XFA_SRC_FXFA_APP_XFA_FFDRAW_H_
diff --git a/xfa/src/fxfa/src/app/xfa_ffexclgroup.cpp b/xfa/src/fxfa/app/xfa_ffexclgroup.cpp
index ba2bb8028c..4fde5ef6e0 100644
--- a/xfa/src/fxfa/src/app/xfa_ffexclgroup.cpp
+++ b/xfa/src/fxfa/app/xfa_ffexclgroup.cpp
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/app/xfa_ffexclgroup.h"
+#include "xfa/src/fxfa/app/xfa_ffexclgroup.h"
 
-#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
-#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
-#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
-#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
+#include "xfa/src/fxfa/app/xfa_ffapp.h"
+#include "xfa/src/fxfa/app/xfa_ffdoc.h"
+#include "xfa/src/fxfa/app/xfa_ffpageview.h"
+#include "xfa/src/fxfa/app/xfa_ffwidget.h"
 
 CXFA_FFExclGroup::CXFA_FFExclGroup(CXFA_FFPageView* pPageView,
                                    CXFA_WidgetAcc* pDataAcc)
diff --git a/xfa/src/fxfa/src/app/xfa_ffexclgroup.h b/xfa/src/fxfa/app/xfa_ffexclgroup.h
index b67b355ffc..52416f9c70 100644
--- a/xfa/src/fxfa/src/app/xfa_ffexclgroup.h
+++ b/xfa/src/fxfa/app/xfa_ffexclgroup.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFEXCLGROUP_H_
-#define XFA_SRC_FXFA_SRC_APP_XFA_FFEXCLGROUP_H_
+#ifndef XFA_SRC_FXFA_APP_XFA_FFEXCLGROUP_H_
+#define XFA_SRC_FXFA_APP_XFA_FFEXCLGROUP_H_
 
-#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
-#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
+#include "xfa/src/fxfa/app/xfa_ffpageview.h"
+#include "xfa/src/fxfa/app/xfa_ffwidget.h"
 
 class CXFA_FFExclGroup : public CXFA_FFWidget {
  public:
@@ -21,4 +21,4 @@ class CXFA_FFExclGroup : public CXFA_FFWidget {
                             int32_t iRotate = 0);
 };
 
-#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFEXCLGROUP_H_
+#endif  // XFA_SRC_FXFA_APP_XFA_FFEXCLGROUP_H_
diff --git a/xfa/src/fxfa/src/app/xfa_fffield.cpp b/xfa/src/fxfa/app/xfa_fffield.cpp
index 53039e34c0..607434c5b7 100644
--- a/xfa/src/fxfa/src/app/xfa_fffield.cpp
+++ b/xfa/src/fxfa/app/xfa_fffield.cpp
@@ -4,19 +4,19 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/app/xfa_fffield.h"
+#include "xfa/src/fxfa/app/xfa_fffield.h"
 
 #include "xfa/include/fwl/basewidget/fwl_edit.h"
 #include "xfa/include/fwl/core/fwl_widgetmgr.h"
 #include "xfa/include/fwl/lightwidget/edit.h"
 #include "xfa/include/fwl/lightwidget/picturebox.h"
-#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
-#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
-#include "xfa/src/fxfa/src/app/xfa_ffdocview.h"
-#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
-#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
-#include "xfa/src/fxfa/src/app/xfa_fwltheme.h"
-#include "xfa/src/fxfa/src/app/xfa_textlayout.h"
+#include "xfa/src/fxfa/app/xfa_ffapp.h"
+#include "xfa/src/fxfa/app/xfa_ffdoc.h"
+#include "xfa/src/fxfa/app/xfa_ffdocview.h"
+#include "xfa/src/fxfa/app/xfa_ffpageview.h"
+#include "xfa/src/fxfa/app/xfa_ffwidget.h"
+#include "xfa/src/fxfa/app/xfa_fwltheme.h"
+#include "xfa/src/fxfa/app/xfa_textlayout.h"
 
 CXFA_FFField::CXFA_FFField(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc)
     : CXFA_FFWidget(pPageView, pDataAcc), m_pNormalWidget(NULL) {
diff --git a/xfa/src/fxfa/src/app/xfa_fffield.h b/xfa/src/fxfa/app/xfa_fffield.h
index 99db117f82..e2699c97b2 100644
--- a/xfa/src/fxfa/src/app/xfa_fffield.h
+++ b/xfa/src/fxfa/app/xfa_fffield.h
@@ -4,19 +4,18 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFFIELD_H_
-#define XFA_SRC_FXFA_SRC_APP_XFA_FFFIELD_H_
+#ifndef XFA_SRC_FXFA_APP_XFA_FFFIELD_H_
+#define XFA_SRC_FXFA_APP_XFA_FFFIELD_H_
 
 #include "xfa/include/fwl/adapter/fwl_sdadapterimp.h"
 #include "xfa/include/fwl/core/fwl_widget.h"
 #include "xfa/include/fwl/lightwidget/widget.h"
-#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
-#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
+#include "xfa/src/fxfa/app/xfa_ffpageview.h"
+#include "xfa/src/fxfa/app/xfa_ffwidget.h"
 
 #define XFA_MINUI_HEIGHT 4.32f
 #define XFA_DEFAULTUI_HEIGHT 2.0f
 
-
 class CXFA_FFField : public CXFA_FFWidget, public IFWL_WidgetDelegate {
  public:
   CXFA_FFField(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc);
@@ -98,4 +97,4 @@ class CXFA_FFField : public CXFA_FFWidget, public IFWL_WidgetDelegate {
   CFX_RectF m_rtCaption;
 };
 
-#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFFIELD_H_
+#endif  // XFA_SRC_FXFA_APP_XFA_FFFIELD_H_
diff --git a/xfa/src/fxfa/src/app/xfa_ffimage.cpp b/xfa/src/fxfa/app/xfa_ffimage.cpp
index 263167600c..37c5991544 100644
--- a/xfa/src/fxfa/src/app/xfa_ffimage.cpp
+++ b/xfa/src/fxfa/app/xfa_ffimage.cpp
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/app/xfa_ffimage.h"
+#include "xfa/src/fxfa/app/xfa_ffimage.h"
 
-#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
-#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
-#include "xfa/src/fxfa/src/app/xfa_ffdraw.h"
-#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
-#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
+#include "xfa/src/fxfa/app/xfa_ffapp.h"
+#include "xfa/src/fxfa/app/xfa_ffdoc.h"
+#include "xfa/src/fxfa/app/xfa_ffdraw.h"
+#include "xfa/src/fxfa/app/xfa_ffpageview.h"
+#include "xfa/src/fxfa/app/xfa_ffwidget.h"
 
 CXFA_FFImage::CXFA_FFImage(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc)
     : CXFA_FFDraw(pPageView, pDataAcc) {}
diff --git a/xfa/src/fxfa/src/app/xfa_ffimage.h b/xfa/src/fxfa/app/xfa_ffimage.h
index 64e0f98a26..5767e16a7b 100644
--- a/xfa/src/fxfa/src/app/xfa_ffimage.h
+++ b/xfa/src/fxfa/app/xfa_ffimage.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFIMAGE_H_
-#define XFA_SRC_FXFA_SRC_APP_XFA_FFIMAGE_H_
+#ifndef XFA_SRC_FXFA_APP_XFA_FFIMAGE_H_
+#define XFA_SRC_FXFA_APP_XFA_FFIMAGE_H_
 
-#include "xfa/src/fxfa/src/app/xfa_ffdraw.h"
+#include "xfa/src/fxfa/app/xfa_ffdraw.h"
 
 class CXFA_FFImage : public CXFA_FFDraw {
  public:
@@ -22,4 +22,4 @@ class CXFA_FFImage : public CXFA_FFDraw {
   virtual void UnloadWidget();
 };
 
-#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFIMAGE_H_
+#endif  // XFA_SRC_FXFA_APP_XFA_FFIMAGE_H_
diff --git a/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp b/xfa/src/fxfa/app/xfa_ffimageedit.cpp
index 5348849975..68e4009139 100644
--- a/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp
+++ b/xfa/src/fxfa/app/xfa_ffimageedit.cpp
@@ -4,15 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/app/xfa_ffimageedit.h"
+#include "xfa/src/fxfa/app/xfa_ffimageedit.h"
 
 #include "xfa/include/fwl/core/fwl_app.h"
 #include "xfa/include/fwl/lightwidget/picturebox.h"
-#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
-#include "xfa/src/fxfa/src/app/xfa_ffdocview.h"
-#include "xfa/src/fxfa/src/app/xfa_fffield.h"
-#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
-#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
+#include "xfa/src/fxfa/app/xfa_ffdoc.h"
+#include "xfa/src/fxfa/app/xfa_ffdocview.h"
+#include "xfa/src/fxfa/app/xfa_fffield.h"
+#include "xfa/src/fxfa/app/xfa_ffpageview.h"
+#include "xfa/src/fxfa/app/xfa_ffwidget.h"
 
 CXFA_FFImageEdit::CXFA_FFImageEdit(CXFA_FFPageView* pPageView,
                                    CXFA_WidgetAcc* pDataAcc)
diff --git a/xfa/src/fxfa/src/app/xfa_ffimageedit.h b/xfa/src/fxfa/app/xfa_ffimageedit.h
index a433a74c0f..d7438ae2e4 100644
--- a/xfa/src/fxfa/src/app/xfa_ffimageedit.h
+++ b/xfa/src/fxfa/app/xfa_ffimageedit.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFIMAGEEDIT_H_
-#define XFA_SRC_FXFA_SRC_APP_XFA_FFIMAGEEDIT_H_
+#ifndef XFA_SRC_FXFA_APP_XFA_FFIMAGEEDIT_H_
+#define XFA_SRC_FXFA_APP_XFA_FFIMAGEEDIT_H_
 
-#include "xfa/src/fxfa/src/app/xfa_fffield.h"
+#include "xfa/src/fxfa/app/xfa_fffield.h"
 
 class CXFA_FFImageEdit : public CXFA_FFField {
  public:
@@ -33,4 +33,4 @@ class CXFA_FFImageEdit : public CXFA_FFField {
   IFWL_WidgetDelegate* m_pOldDelegate;
 };
 
-#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFIMAGEEDIT_H_
+#endif  // XFA_SRC_FXFA_APP_XFA_FFIMAGEEDIT_H_
diff --git a/xfa/src/fxfa/src/app/xfa_ffnotify.cpp b/xfa/src/fxfa/app/xfa_ffnotify.cpp
index 19ce6320b6..6b9094c77b 100644
--- a/xfa/src/fxfa/src/app/xfa_ffnotify.cpp
+++ b/xfa/src/fxfa/app/xfa_ffnotify.cpp
@@ -4,31 +4,31 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/app/xfa_ffnotify.h"
+#include "xfa/src/fxfa/app/xfa_ffnotify.h"
 
-#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
-#include "xfa/src/fxfa/src/app/xfa_ffbarcode.h"
-#include "xfa/src/fxfa/src/app/xfa_ffcheckbutton.h"
-#include "xfa/src/fxfa/src/app/xfa_ffchoicelist.h"
-#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
-#include "xfa/src/fxfa/src/app/xfa_ffdocview.h"
-#include "xfa/src/fxfa/src/app/xfa_ffdraw.h"
-#include "xfa/src/fxfa/src/app/xfa_ffexclgroup.h"
-#include "xfa/src/fxfa/src/app/xfa_fffield.h"
-#include "xfa/src/fxfa/src/app/xfa_ffimage.h"
-#include "xfa/src/fxfa/src/app/xfa_ffimageedit.h"
-#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
-#include "xfa/src/fxfa/src/app/xfa_ffpath.h"
-#include "xfa/src/fxfa/src/app/xfa_ffpushbutton.h"
-#include "xfa/src/fxfa/src/app/xfa_ffsignature.h"
-#include "xfa/src/fxfa/src/app/xfa_ffsubform.h"
-#include "xfa/src/fxfa/src/app/xfa_fftext.h"
-#include "xfa/src/fxfa/src/app/xfa_fftextedit.h"
-#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
-#include "xfa/src/fxfa/src/app/xfa_ffwidgetacc.h"
-#include "xfa/src/fxfa/src/app/xfa_ffwidgethandler.h"
-#include "xfa/src/fxfa/src/app/xfa_fwladapter.h"
-#include "xfa/src/fxfa/src/app/xfa_textlayout.h"
+#include "xfa/src/fxfa/app/xfa_ffapp.h"
+#include "xfa/src/fxfa/app/xfa_ffbarcode.h"
+#include "xfa/src/fxfa/app/xfa_ffcheckbutton.h"
+#include "xfa/src/fxfa/app/xfa_ffchoicelist.h"
+#include "xfa/src/fxfa/app/xfa_ffdoc.h"
+#include "xfa/src/fxfa/app/xfa_ffdocview.h"
+#include "xfa/src/fxfa/app/xfa_ffdraw.h"
+#include "xfa/src/fxfa/app/xfa_ffexclgroup.h"
+#include "xfa/src/fxfa/app/xfa_fffield.h"
+#include "xfa/src/fxfa/app/xfa_ffimage.h"
+#include "xfa/src/fxfa/app/xfa_ffimageedit.h"
+#include "xfa/src/fxfa/app/xfa_ffpageview.h"
+#include "xfa/src/fxfa/app/xfa_ffpath.h"
+#include "xfa/src/fxfa/app/xfa_ffpushbutton.h"
+#include "xfa/src/fxfa/app/xfa_ffsignature.h"
+#include "xfa/src/fxfa/app/xfa_ffsubform.h"
+#include "xfa/src/fxfa/app/xfa_fftext.h"
+#include "xfa/src/fxfa/app/xfa_fftextedit.h"
+#include "xfa/src/fxfa/app/xfa_ffwidget.h"
+#include "xfa/src/fxfa/app/xfa_ffwidgetacc.h"
+#include "xfa/src/fxfa/app/xfa_ffwidgethandler.h"
+#include "xfa/src/fxfa/app/xfa_fwladapter.h"
+#include "xfa/src/fxfa/app/xfa_textlayout.h"
 
 static void XFA_FFDeleteWidgetAcc(void* pData) {
   delete static_cast<CXFA_WidgetAcc*>(pData);
@@ -618,8 +618,7 @@ void CXFA_FFNotify::OnLayoutItemRectChanged(CXFA_FFDocView* pDocView,
                                             IXFA_DocLayout* pLayout,
                                             CXFA_LayoutItem* pSender,
                                             void* pParam,
-                                            void* pParam2) {
-}
+                                            void* pParam2) {}
 void CXFA_FFNotify::OnLayoutItemStatustChanged(CXFA_FFDocView* pDocView,
                                                IXFA_DocLayout* pLayout,
                                                CXFA_LayoutItem* pSender,
diff --git a/xfa/src/fxfa/src/app/xfa_ffnotify.h b/xfa/src/fxfa/app/xfa_ffnotify.h
index 3a6093be7c..0e0b77bed6 100644
--- a/xfa/src/fxfa/src/app/xfa_ffnotify.h
+++ b/xfa/src/fxfa/app/xfa_ffnotify.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFNOTIFY_H_
-#define XFA_SRC_FXFA_SRC_APP_XFA_FFNOTIFY_H_
+#ifndef XFA_SRC_FXFA_APP_XFA_FFNOTIFY_H_
+#define XFA_SRC_FXFA_APP_XFA_FFNOTIFY_H_
 
-#include "xfa/src/fxfa/src/common/xfa_document.h"
+#include "xfa/src/fxfa/parser/xfa_document.h"
 
 class CXFA_FFNotify : public IXFA_Notify {
  public:
@@ -96,4 +96,4 @@ class CXFA_FFNotify : public IXFA_Notify {
   CXFA_FFDoc* m_pDoc;
 };
 
-#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFNOTIFY_H_
+#endif  // XFA_SRC_FXFA_APP_XFA_FFNOTIFY_H_
diff --git a/xfa/src/fxfa/src/app/xfa_ffpageview.cpp b/xfa/src/fxfa/app/xfa_ffpageview.cpp
index 2a88e50343..3b0f63f4d9 100644
--- a/xfa/src/fxfa/src/app/xfa_ffpageview.cpp
+++ b/xfa/src/fxfa/app/xfa_ffpageview.cpp
@@ -4,19 +4,19 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
+#include "xfa/src/fxfa/app/xfa_ffpageview.h"
 
 #include "xfa/src/fdp/include/fde_rdr.h"
-#include "xfa/src/fxfa/src/app/xfa_ffcheckbutton.h"
-#include "xfa/src/fxfa/src/app/xfa_ffchoicelist.h"
-#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
-#include "xfa/src/fxfa/src/app/xfa_ffdocview.h"
-#include "xfa/src/fxfa/src/app/xfa_fffield.h"
-#include "xfa/src/fxfa/src/app/xfa_ffimageedit.h"
-#include "xfa/src/fxfa/src/app/xfa_ffpushbutton.h"
-#include "xfa/src/fxfa/src/app/xfa_fftextedit.h"
-#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
-#include "xfa/src/fxfa/src/app/xfa_fwladapter.h"
+#include "xfa/src/fxfa/app/xfa_ffcheckbutton.h"
+#include "xfa/src/fxfa/app/xfa_ffchoicelist.h"
+#include "xfa/src/fxfa/app/xfa_ffdoc.h"
+#include "xfa/src/fxfa/app/xfa_ffdocview.h"
+#include "xfa/src/fxfa/app/xfa_fffield.h"
+#include "xfa/src/fxfa/app/xfa_ffimageedit.h"
+#include "xfa/src/fxfa/app/xfa_ffpushbutton.h"
+#include "xfa/src/fxfa/app/xfa_fftextedit.h"
+#include "xfa/src/fxfa/app/xfa_ffwidget.h"
+#include "xfa/src/fxfa/app/xfa_fwladapter.h"
 
 CXFA_FFPageView::CXFA_FFPageView(CXFA_FFDocView* pDocView, CXFA_Node* pPageArea)
     : CXFA_ContainerLayoutItem(pPageArea),
diff --git a/xfa/src/fxfa/src/app/xfa_ffpageview.h b/xfa/src/fxfa/app/xfa_ffpageview.h
index 6ee2e140fb..58e63774b8 100644
--- a/xfa/src/fxfa/src/app/xfa_ffpageview.h
+++ b/xfa/src/fxfa/app/xfa_ffpageview.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFPAGEVIEW_H_
-#define XFA_SRC_FXFA_SRC_APP_XFA_FFPAGEVIEW_H_
+#ifndef XFA_SRC_FXFA_APP_XFA_FFPAGEVIEW_H_
+#define XFA_SRC_FXFA_APP_XFA_FFPAGEVIEW_H_
 
-#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
+#include "xfa/src/fxfa/parser/xfa_doclayout.h"
 
 class CXFA_FFWidget;
 class CXFA_FFDocView;
@@ -108,4 +108,4 @@ class CXFA_FFTabOrderPageWidgetIterator : public IXFA_WidgetIterator {
                       FX_BOOL bMarsterPage = FALSE);
 };
 
-#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFPAGEVIEW_H_
+#endif  // XFA_SRC_FXFA_APP_XFA_FFPAGEVIEW_H_
diff --git a/xfa/src/fxfa/src/app/xfa_ffpath.cpp b/xfa/src/fxfa/app/xfa_ffpath.cpp
index 1fdcb83051..6f744c9753 100644
--- a/xfa/src/fxfa/src/app/xfa_ffpath.cpp
+++ b/xfa/src/fxfa/app/xfa_ffpath.cpp
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/app/xfa_ffpath.h"
+#include "xfa/src/fxfa/app/xfa_ffpath.h"
 
 #include "xfa/include/fxgraphics/fx_graphics.h"
-#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
-#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
-#include "xfa/src/fxfa/src/app/xfa_ffdraw.h"
-#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
-#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
+#include "xfa/src/fxfa/app/xfa_ffapp.h"
+#include "xfa/src/fxfa/app/xfa_ffdoc.h"
+#include "xfa/src/fxfa/app/xfa_ffdraw.h"
+#include "xfa/src/fxfa/app/xfa_ffpageview.h"
+#include "xfa/src/fxfa/app/xfa_ffwidget.h"
 
 CXFA_FFLine::CXFA_FFLine(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc)
     : CXFA_FFDraw(pPageView, pDataAcc) {}
diff --git a/xfa/src/fxfa/src/app/xfa_ffpath.h b/xfa/src/fxfa/app/xfa_ffpath.h
index 05a67bd16f..a215812b90 100644
--- a/xfa/src/fxfa/src/app/xfa_ffpath.h
+++ b/xfa/src/fxfa/app/xfa_ffpath.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFPATH_H_
-#define XFA_SRC_FXFA_SRC_APP_XFA_FFPATH_H_
+#ifndef XFA_SRC_FXFA_APP_XFA_FFPATH_H_
+#define XFA_SRC_FXFA_APP_XFA_FFPATH_H_
 
-#include "xfa/src/fxfa/src/app/xfa_ffdraw.h"
+#include "xfa/src/fxfa/app/xfa_ffdraw.h"
 
 class CXFA_FFLine : public CXFA_FFDraw {
  public:
@@ -40,4 +40,4 @@ class CXFA_FFRectangle : public CXFA_FFDraw {
                             int32_t iRotate = 0);
 };
 
-#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFPATH_H_
+#endif  // XFA_SRC_FXFA_APP_XFA_FFPATH_H_
diff --git a/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp b/xfa/src/fxfa/app/xfa_ffpushbutton.cpp
index 9c3c5f5b17..492a13544c 100644
--- a/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp
+++ b/xfa/src/fxfa/app/xfa_ffpushbutton.cpp
@@ -4,16 +4,16 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/app/xfa_ffpushbutton.h"
+#include "xfa/src/fxfa/app/xfa_ffpushbutton.h"
 
 #include "xfa/include/fwl/core/fwl_widgetmgr.h"
 #include "xfa/include/fwl/lightwidget/pushbutton.h"
-#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
-#include "xfa/src/fxfa/src/app/xfa_fffield.h"
-#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
-#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
-#include "xfa/src/fxfa/src/app/xfa_ffwidgetacc.h"
-#include "xfa/src/fxfa/src/app/xfa_textlayout.h"
+#include "xfa/src/fxfa/app/xfa_ffapp.h"
+#include "xfa/src/fxfa/app/xfa_fffield.h"
+#include "xfa/src/fxfa/app/xfa_ffpageview.h"
+#include "xfa/src/fxfa/app/xfa_ffwidget.h"
+#include "xfa/src/fxfa/app/xfa_ffwidgetacc.h"
+#include "xfa/src/fxfa/app/xfa_textlayout.h"
 
 CXFA_FFPushButton::CXFA_FFPushButton(CXFA_FFPageView* pPageView,
                                      CXFA_WidgetAcc* pDataAcc)
diff --git a/xfa/src/fxfa/src/app/xfa_ffpushbutton.h b/xfa/src/fxfa/app/xfa_ffpushbutton.h
index fca02fad97..19e72a7796 100644
--- a/xfa/src/fxfa/src/app/xfa_ffpushbutton.h
+++ b/xfa/src/fxfa/app/xfa_ffpushbutton.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFPUSHBUTTON_H_
-#define XFA_SRC_FXFA_SRC_APP_XFA_FFPUSHBUTTON_H_
+#ifndef XFA_SRC_FXFA_APP_XFA_FFPUSHBUTTON_H_
+#define XFA_SRC_FXFA_APP_XFA_FFPUSHBUTTON_H_
 
-#include "xfa/src/fxfa/src/app/xfa_fffield.h"
+#include "xfa/src/fxfa/app/xfa_fffield.h"
 
 #define XFA_FWL_PSBSTYLEEXT_HiliteNone (0L << 0)
 #define XFA_FWL_PSBSTYLEEXT_HiliteInverted (1L << 0)
@@ -47,4 +47,4 @@ class CXFA_FFPushButton : public CXFA_FFField {
   IFWL_WidgetDelegate* m_pOldDelegate;
 };
 
-#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFPUSHBUTTON_H_
+#endif  // XFA_SRC_FXFA_APP_XFA_FFPUSHBUTTON_H_
diff --git a/xfa/src/fxfa/src/app/xfa_ffsignature.cpp b/xfa/src/fxfa/app/xfa_ffsignature.cpp
index a53d7c26a3..9c4d31bbc4 100644
--- a/xfa/src/fxfa/src/app/xfa_ffsignature.cpp
+++ b/xfa/src/fxfa/app/xfa_ffsignature.cpp
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/app/xfa_ffsignature.h"
+#include "xfa/src/fxfa/app/xfa_ffsignature.h"
 
-#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
-#include "xfa/src/fxfa/src/app/xfa_fffield.h"
-#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
-#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
+#include "xfa/src/fxfa/app/xfa_ffdoc.h"
+#include "xfa/src/fxfa/app/xfa_fffield.h"
+#include "xfa/src/fxfa/app/xfa_ffpageview.h"
+#include "xfa/src/fxfa/app/xfa_ffwidget.h"
 
 CXFA_FFSignature::CXFA_FFSignature(CXFA_FFPageView* pPageView,
                                    CXFA_WidgetAcc* pDataAcc)
diff --git a/xfa/src/fxfa/src/app/xfa_ffsignature.h b/xfa/src/fxfa/app/xfa_ffsignature.h
index d873614ed8..6c7a614157 100644
--- a/xfa/src/fxfa/src/app/xfa_ffsignature.h
+++ b/xfa/src/fxfa/app/xfa_ffsignature.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFSIGNATURE_H_
-#define XFA_SRC_FXFA_SRC_APP_XFA_FFSIGNATURE_H_
+#ifndef XFA_SRC_FXFA_APP_XFA_FFSIGNATURE_H_
+#define XFA_SRC_FXFA_APP_XFA_FFSIGNATURE_H_
 
-#include "xfa/src/fxfa/src/app/xfa_fffield.h"
+#include "xfa/src/fxfa/app/xfa_fffield.h"
 
 class CXFA_FFSignature final : public CXFA_FFField {
  public:
@@ -40,4 +40,4 @@ class CXFA_FFSignature final : public CXFA_FFField {
   virtual FX_BOOL OnSetCursor(FX_FLOAT fx, FX_FLOAT fy);
 };
 
-#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFSIGNATURE_H_
+#endif  // XFA_SRC_FXFA_APP_XFA_FFSIGNATURE_H_
diff --git a/xfa/src/fxfa/src/app/xfa_ffsubform.cpp b/xfa/src/fxfa/app/xfa_ffsubform.cpp
index 0e932b22a2..8845a36ed9 100644
--- a/xfa/src/fxfa/src/app/xfa_ffsubform.cpp
+++ b/xfa/src/fxfa/app/xfa_ffsubform.cpp
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/app/xfa_ffsubform.h"
+#include "xfa/src/fxfa/app/xfa_ffsubform.h"
 
-#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
-#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
-#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
-#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
+#include "xfa/src/fxfa/app/xfa_ffapp.h"
+#include "xfa/src/fxfa/app/xfa_ffdoc.h"
+#include "xfa/src/fxfa/app/xfa_ffpageview.h"
+#include "xfa/src/fxfa/app/xfa_ffwidget.h"
 
 CXFA_FFSubForm::CXFA_FFSubForm(CXFA_FFPageView* pPageView,
                                CXFA_WidgetAcc* pDataAcc)
diff --git a/xfa/src/fxfa/src/app/xfa_ffsubform.h b/xfa/src/fxfa/app/xfa_ffsubform.h
index 11c1123b08..cb82f91c64 100644
--- a/xfa/src/fxfa/src/app/xfa_ffsubform.h
+++ b/xfa/src/fxfa/app/xfa_ffsubform.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFSUBFORM_H_
-#define XFA_SRC_FXFA_SRC_APP_XFA_FFSUBFORM_H_
+#ifndef XFA_SRC_FXFA_APP_XFA_FFSUBFORM_H_
+#define XFA_SRC_FXFA_APP_XFA_FFSUBFORM_H_
 
-#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
-#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
+#include "xfa/src/fxfa/app/xfa_ffpageview.h"
+#include "xfa/src/fxfa/app/xfa_ffwidget.h"
 
 class CXFA_FFSubForm : public CXFA_FFWidget {
  public:
@@ -16,4 +16,4 @@ class CXFA_FFSubForm : public CXFA_FFWidget {
   virtual ~CXFA_FFSubForm();
 };
 
-#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFSUBFORM_H_
+#endif  // XFA_SRC_FXFA_APP_XFA_FFSUBFORM_H_
diff --git a/xfa/src/fxfa/src/app/xfa_fftext.cpp b/xfa/src/fxfa/app/xfa_fftext.cpp
index d1774e67a2..2e9abb9f81 100644
--- a/xfa/src/fxfa/src/app/xfa_fftext.cpp
+++ b/xfa/src/fxfa/app/xfa_fftext.cpp
@@ -4,16 +4,16 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/app/xfa_fftext.h"
+#include "xfa/src/fxfa/app/xfa_fftext.h"
 
 #include "xfa/include/fwl/core/fwl_widgetdef.h"
 #include "xfa/include/fxgraphics/fx_graphics.h"
-#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
-#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
-#include "xfa/src/fxfa/src/app/xfa_ffdraw.h"
-#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
-#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
-#include "xfa/src/fxfa/src/app/xfa_textlayout.h"
+#include "xfa/src/fxfa/app/xfa_ffapp.h"
+#include "xfa/src/fxfa/app/xfa_ffdoc.h"
+#include "xfa/src/fxfa/app/xfa_ffdraw.h"
+#include "xfa/src/fxfa/app/xfa_ffpageview.h"
+#include "xfa/src/fxfa/app/xfa_ffwidget.h"
+#include "xfa/src/fxfa/app/xfa_textlayout.h"
 
 CXFA_FFText::CXFA_FFText(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc)
     : CXFA_FFDraw(pPageView, pDataAcc) {}
diff --git a/xfa/src/fxfa/src/app/xfa_fftext.h b/xfa/src/fxfa/app/xfa_fftext.h
index bb4b5a9f0c..673d157fd3 100644
--- a/xfa/src/fxfa/src/app/xfa_fftext.h
+++ b/xfa/src/fxfa/app/xfa_fftext.h
@@ -4,11 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFTEXT_H_
-#define XFA_SRC_FXFA_SRC_APP_XFA_FFTEXT_H_
-
-#include "xfa/src/fxfa/src/app/xfa_ffdraw.h"
+#ifndef XFA_SRC_FXFA_APP_XFA_FFTEXT_H_
+#define XFA_SRC_FXFA_APP_XFA_FFTEXT_H_
 
+#include "xfa/src/fxfa/app/xfa_ffdraw.h"
 
 class CXFA_FFText : public CXFA_FFDraw {
  public:
@@ -30,4 +29,4 @@ class CXFA_FFText : public CXFA_FFDraw {
   void FWLToClient(FX_FLOAT& fx, FX_FLOAT& fy);
 };
 
-#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFTEXT_H_
+#endif  // XFA_SRC_FXFA_APP_XFA_FFTEXT_H_
diff --git a/xfa/src/fxfa/src/app/xfa_fftextedit.cpp b/xfa/src/fxfa/app/xfa_fftextedit.cpp
index bdee996b5f..5457324d9d 100644
--- a/xfa/src/fxfa/src/app/xfa_fftextedit.cpp
+++ b/xfa/src/fxfa/app/xfa_fftextedit.cpp
@@ -4,21 +4,21 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/app/xfa_fftextedit.h"
+#include "xfa/src/fxfa/app/xfa_fftextedit.h"
 
 #include "xfa/include/fwl/basewidget/fwl_datetimepicker.h"
 #include "xfa/include/fwl/basewidget/fwl_edit.h"
 #include "xfa/include/fwl/lightwidget/datetimepicker.h"
 #include "xfa/include/fwl/lightwidget/edit.h"
-#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
-#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
-#include "xfa/src/fxfa/src/app/xfa_ffdocview.h"
-#include "xfa/src/fxfa/src/app/xfa_fffield.h"
-#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
-#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
-#include "xfa/src/fxfa/src/app/xfa_fwladapter.h"
-#include "xfa/src/fxfa/src/app/xfa_textlayout.h"
-#include "xfa/src/fxfa/src/common/fxfa_localevalue.h"
+#include "xfa/src/fxfa/app/xfa_ffapp.h"
+#include "xfa/src/fxfa/app/xfa_ffdoc.h"
+#include "xfa/src/fxfa/app/xfa_ffdocview.h"
+#include "xfa/src/fxfa/app/xfa_fffield.h"
+#include "xfa/src/fxfa/app/xfa_ffpageview.h"
+#include "xfa/src/fxfa/app/xfa_ffwidget.h"
+#include "xfa/src/fxfa/app/xfa_fwladapter.h"
+#include "xfa/src/fxfa/app/xfa_textlayout.h"
+#include "xfa/src/fxfa/parser/xfa_localevalue.h"
 
 CXFA_FFTextEdit::CXFA_FFTextEdit(CXFA_FFPageView* pPageView,
                                  CXFA_WidgetAcc* pDataAcc)
diff --git a/xfa/src/fxfa/src/app/xfa_fftextedit.h b/xfa/src/fxfa/app/xfa_fftextedit.h
index 638d506ae3..f961e5a4da 100644
--- a/xfa/src/fxfa/src/app/xfa_fftextedit.h
+++ b/xfa/src/fxfa/app/xfa_fftextedit.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFTEXTEDIT_H_
-#define XFA_SRC_FXFA_SRC_APP_XFA_FFTEXTEDIT_H_
+#ifndef XFA_SRC_FXFA_APP_XFA_FFTEXTEDIT_H_
+#define XFA_SRC_FXFA_APP_XFA_FFTEXTEDIT_H_
 
-#include "xfa/src/fxfa/src/app/xfa_fffield.h"
+#include "xfa/src/fxfa/app/xfa_fffield.h"
 
 class CXFA_FFTextEdit : public CXFA_FFField {
  public:
@@ -133,4 +133,4 @@ class CXFA_FFDateTimeEdit : public CXFA_FFTextEdit {
   virtual FWL_ERR OnProcessEvent(CFWL_Event* pEvent);
 };
 
-#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFTEXTEDIT_H_
+#endif  // XFA_SRC_FXFA_APP_XFA_FFTEXTEDIT_H_
diff --git a/xfa/src/fxfa/src/app/xfa_ffwidget.cpp b/xfa/src/fxfa/app/xfa_ffwidget.cpp
index e8138397e0..7afa6fa12b 100644
--- a/xfa/src/fxfa/src/app/xfa_ffwidget.cpp
+++ b/xfa/src/fxfa/app/xfa_ffwidget.cpp
@@ -4,18 +4,18 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
+#include "xfa/src/fxfa/app/xfa_ffwidget.h"
 
 #include <algorithm>
 
 #include "core/include/fpdfapi/fpdf_page.h"
 #include "core/include/fxcodec/fx_codec.h"
 #include "xfa/include/fxgraphics/fx_graphics.h"
-#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
-#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
-#include "xfa/src/fxfa/src/app/xfa_ffdocview.h"
-#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
-#include "xfa/src/fxfa/src/app/xfa_textlayout.h"
+#include "xfa/src/fxfa/app/xfa_ffapp.h"
+#include "xfa/src/fxfa/app/xfa_ffdoc.h"
+#include "xfa/src/fxfa/app/xfa_ffdocview.h"
+#include "xfa/src/fxfa/app/xfa_ffpageview.h"
+#include "xfa/src/fxfa/app/xfa_textlayout.h"
 
 CXFA_FFWidget::CXFA_FFWidget(CXFA_FFPageView* pPageView,
                              CXFA_WidgetAcc* pDataAcc)
diff --git a/xfa/src/fxfa/src/app/xfa_ffwidget.h b/xfa/src/fxfa/app/xfa_ffwidget.h
index 526545ac49..5ff4295a52 100644
--- a/xfa/src/fxfa/src/app/xfa_ffwidget.h
+++ b/xfa/src/fxfa/app/xfa_ffwidget.h
@@ -4,15 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFWIDGET_H_
-#define XFA_SRC_FXFA_SRC_APP_XFA_FFWIDGET_H_
+#ifndef XFA_SRC_FXFA_APP_XFA_FFWIDGET_H_
+#define XFA_SRC_FXFA_APP_XFA_FFWIDGET_H_
 
 #include <vector>
 
 #include "core/include/fxcodec/fx_codec_def.h"
 #include "core/include/fxge/fx_ge.h"
 #include "xfa/include/fxfa/fxfa.h"
-#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
+#include "xfa/src/fxfa/parser/xfa_doclayout.h"
 
 class CXFA_FFPageView;
 class CXFA_FFDocView;
@@ -184,4 +184,4 @@ void XFA_DrawBox(CXFA_Box box,
                  CFX_Matrix* pMatrix,
                  FX_DWORD dwFlags = 0);
 
-#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFWIDGET_H_
+#endif  // XFA_SRC_FXFA_APP_XFA_FFWIDGET_H_
diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp b/xfa/src/fxfa/app/xfa_ffwidgetacc.cpp
index dbdc02a871..313f946a0f 100644
--- a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp
+++ b/xfa/src/fxfa/app/xfa_ffwidgetacc.cpp
@@ -4,24 +4,24 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/app/xfa_ffwidgetacc.h"
+#include "xfa/src/fxfa/app/xfa_ffwidgetacc.h"
 
 #include <algorithm>
 
 #include "xfa/src/fdp/include/fde_tto.h"
-#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
-#include "xfa/src/fxfa/src/app/xfa_ffcheckbutton.h"
-#include "xfa/src/fxfa/src/app/xfa_ffchoicelist.h"
-#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
-#include "xfa/src/fxfa/src/app/xfa_ffdocview.h"
-#include "xfa/src/fxfa/src/app/xfa_fffield.h"
-#include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
-#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
-#include "xfa/src/fxfa/src/app/xfa_fontmgr.h"
-#include "xfa/src/fxfa/src/app/xfa_fwladapter.h"
-#include "xfa/src/fxfa/src/app/xfa_textlayout.h"
-#include "xfa/src/fxfa/src/common/fxfa_localevalue.h"
-#include "xfa/src/fxfa/src/common/xfa_script.h"
+#include "xfa/src/fxfa/app/xfa_ffapp.h"
+#include "xfa/src/fxfa/app/xfa_ffcheckbutton.h"
+#include "xfa/src/fxfa/app/xfa_ffchoicelist.h"
+#include "xfa/src/fxfa/app/xfa_ffdoc.h"
+#include "xfa/src/fxfa/app/xfa_ffdocview.h"
+#include "xfa/src/fxfa/app/xfa_fffield.h"
+#include "xfa/src/fxfa/app/xfa_ffpageview.h"
+#include "xfa/src/fxfa/app/xfa_ffwidget.h"
+#include "xfa/src/fxfa/app/xfa_fontmgr.h"
+#include "xfa/src/fxfa/app/xfa_fwladapter.h"
+#include "xfa/src/fxfa/app/xfa_textlayout.h"
+#include "xfa/src/fxfa/parser/xfa_localevalue.h"
+#include "xfa/src/fxfa/parser/xfa_script.h"
 
 static void XFA_FFDeleteCalcData(void* pData) {
   if (pData) {
diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.h b/xfa/src/fxfa/app/xfa_ffwidgetacc.h
index 4e6eb9009d..19bd28d393 100644
--- a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.h
+++ b/xfa/src/fxfa/app/xfa_ffwidgetacc.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFWIDGETACC_H_
-#define XFA_SRC_FXFA_SRC_APP_XFA_FFWIDGETACC_H_
+#ifndef XFA_SRC_FXFA_APP_XFA_FFWIDGETACC_H_
+#define XFA_SRC_FXFA_APP_XFA_FFWIDGETACC_H_
 
-#include "xfa/src/fxfa/src/app/xfa_textlayout.h"
+#include "xfa/src/fxfa/app/xfa_textlayout.h"
 
 enum XFA_TEXTPROVIDERTYPE {
   XFA_TEXTPROVIDERTYPE_Text,
@@ -41,4 +41,4 @@ class CXFA_TextProvider : public IXFA_TextProvider {
   CXFA_Node* m_pTextNode;
 };
 
-#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FFWIDGETACC_H_
+#endif  // XFA_SRC_FXFA_APP_XFA_FFWIDGETACC_H_
diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp b/xfa/src/fxfa/app/xfa_ffwidgethandler.cpp
index d5f286668c..62f21fa644 100644
--- a/xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp
+++ b/xfa/src/fxfa/app/xfa_ffwidgethandler.cpp
@@ -4,15 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/app/xfa_ffwidgethandler.h"
+#include "xfa/src/fxfa/app/xfa_ffwidgethandler.h"
 
-#include "xfa/src/fxfa/src/app/xfa_ffchoicelist.h"
-#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
-#include "xfa/src/fxfa/src/app/xfa_ffdocview.h"
-#include "xfa/src/fxfa/src/app/xfa_fffield.h"
-#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
-#include "xfa/src/fxfa/src/app/xfa_fwladapter.h"
-#include "xfa/src/fxfa/src/common/xfa_parser.h"
+#include "xfa/src/fxfa/app/xfa_ffchoicelist.h"
+#include "xfa/src/fxfa/app/xfa_ffdoc.h"
+#include "xfa/src/fxfa/app/xfa_ffdocview.h"
+#include "xfa/src/fxfa/app/xfa_fffield.h"
+#include "xfa/src/fxfa/app/xfa_ffwidget.h"
+#include "xfa/src/fxfa/app/xfa_fwladapter.h"
+#include "xfa/src/fxfa/parser/xfa_parser.h"
 
 CXFA_FFWidgetHandler::CXFA_FFWidgetHandler(CXFA_FFDocView* pDocView)
     : m_pDocView(pDocView) {}
diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgethandler.h b/xfa/src/fxfa/app/xfa_ffwidgethandler.h
index 645a9e7bb1..73de9e2c94 100644
--- a/xfa/src/fxfa/src/app/xfa_ffwidgethandler.h
+++ b/xfa/src/fxfa/app/xfa_ffwidgethandler.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFWIDGETHANDLER_H_
-#define XFA_SRC_FXFA_SRC_APP_XFA_FFWIDGETHANDLER_H_
+#ifndef XFA_SRC_FXFA_APP_XFA_FFWIDGETHANDLER_H_
+#define XFA_SRC_FXFA_APP_XFA_FFWIDGETHANDLER_H_
 
 #include <vector>
 
 #include "xfa/include/fxfa/fxfa.h"
-#include "xfa/src/fxfa/src/common/xfa_document.h"
+#include "xfa/src/fxfa/parser/xfa_document.h"
 
 class CXFA_FFDocView;
 
@@ -173,4 +173,4 @@ class CXFA_FFMenuHandler : public IXFA_MenuHandler {
                                         const CFX_ByteStringC& bsReplace);
 };
 
-#endif  //  XFA_SRC_FXFA_SRC_APP_XFA_FFWIDGETHANDLER_H_
+#endif  //  XFA_SRC_FXFA_APP_XFA_FFWIDGETHANDLER_H_
diff --git a/xfa/src/fxfa/src/app/xfa_fontmgr.cpp b/xfa/src/fxfa/app/xfa_fontmgr.cpp
index f1cc37f244..cc5de78d63 100644
--- a/xfa/src/fxfa/src/app/xfa_fontmgr.cpp
+++ b/xfa/src/fxfa/app/xfa_fontmgr.cpp
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/app/xfa_fontmgr.h"
+#include "xfa/src/fxfa/app/xfa_fontmgr.h"
 
 #include <algorithm>
 
 #include "core/include/fpdfapi/fpdf_resource.h"
-#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
-#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
+#include "xfa/src/fxfa/app/xfa_ffapp.h"
+#include "xfa/src/fxfa/app/xfa_ffdoc.h"
 
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 static const XFA_FONTINFO g_XFAFontsMap[] = {
diff --git a/xfa/src/fxfa/src/app/xfa_fontmgr.h b/xfa/src/fxfa/app/xfa_fontmgr.h
index 86c08d0fa5..b8fa4ae31c 100644
--- a/xfa/src/fxfa/src/app/xfa_fontmgr.h
+++ b/xfa/src/fxfa/app/xfa_fontmgr.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FONTMGR_H_
-#define XFA_SRC_FXFA_SRC_APP_XFA_FONTMGR_H_
+#ifndef XFA_SRC_FXFA_APP_XFA_FONTMGR_H_
+#define XFA_SRC_FXFA_APP_XFA_FONTMGR_H_
 
 #include <map>
 
@@ -95,4 +95,4 @@ class CXFA_FontMgr {
   std::map<CFX_ByteString, IFX_Font*> m_FontMap;
 };
 
-#endif  //  XFA_SRC_FXFA_SRC_APP_XFA_FONTMGR_H_
+#endif  //  XFA_SRC_FXFA_APP_XFA_FONTMGR_H_
diff --git a/xfa/src/fxfa/src/app/xfa_fwladapter.cpp b/xfa/src/fxfa/app/xfa_fwladapter.cpp
index 1ac480bf7f..a43cd9c084 100644
--- a/xfa/src/fxfa/src/app/xfa_fwladapter.cpp
+++ b/xfa/src/fxfa/app/xfa_fwladapter.cpp
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/app/xfa_fwladapter.h"
+#include "xfa/src/fxfa/app/xfa_fwladapter.h"
 
-#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
-#include "xfa/src/fxfa/src/app/xfa_fffield.h"
-#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
+#include "xfa/src/fxfa/app/xfa_ffdoc.h"
+#include "xfa/src/fxfa/app/xfa_fffield.h"
+#include "xfa/src/fxfa/app/xfa_ffwidget.h"
 
 void FWL_PostMessageToMainRoop(CFWL_Message* pMessage) {}
 FX_BOOL FWL_ShowCaret(IFWL_Widget* pWidget,
diff --git a/xfa/src/fxfa/src/app/xfa_fwladapter.h b/xfa/src/fxfa/app/xfa_fwladapter.h
index 88a7fa930b..daa8413ea3 100644
--- a/xfa/src/fxfa/src/app/xfa_fwladapter.h
+++ b/xfa/src/fxfa/app/xfa_fwladapter.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FWLADAPTER_H_
-#define XFA_SRC_FXFA_SRC_APP_XFA_FWLADAPTER_H_
+#ifndef XFA_SRC_FXFA_APP_XFA_FWLADAPTER_H_
+#define XFA_SRC_FXFA_APP_XFA_FWLADAPTER_H_
 
 #include "xfa/include/fwl/adapter/fwl_sdadapterimp.h"
 
@@ -19,4 +19,4 @@ class CXFA_FWLAdapterWidgetMgr : public CFWL_SDAdapterWidgetMgr {
                               CFX_RectF& rtPopup);
 };
 
-#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FWLADAPTER_H_
+#endif  // XFA_SRC_FXFA_APP_XFA_FWLADAPTER_H_
diff --git a/xfa/src/fxfa/src/app/xfa_fwltheme.cpp b/xfa/src/fxfa/app/xfa_fwltheme.cpp
index 1b768e8489..a97412cf0e 100644
--- a/xfa/src/fxfa/src/app/xfa_fwltheme.cpp
+++ b/xfa/src/fxfa/app/xfa_fwltheme.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/app/xfa_fwltheme.h"
+#include "xfa/src/fxfa/app/xfa_fwltheme.h"
 
 #include "xfa/include/fwl/basewidget/fwl_barcode.h"
 #include "xfa/include/fwl/basewidget/fwl_caret.h"
@@ -19,8 +19,8 @@
 #include "xfa/include/fwl/basewidget/fwl_scrollbar.h"
 #include "xfa/src/fdp/include/fde_tto.h"
 #include "xfa/src/fgas/include/fx_cpg.h"
-#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
-#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
+#include "xfa/src/fxfa/app/xfa_ffapp.h"
+#include "xfa/src/fxfa/app/xfa_ffwidget.h"
 
 CXFA_FFWidget* XFA_ThemeGetOuterWidget(IFWL_Widget* pWidget) {
   IFWL_Widget* pOuter = pWidget;
diff --git a/xfa/src/fxfa/src/app/xfa_fwltheme.h b/xfa/src/fxfa/app/xfa_fwltheme.h
index f58f9569b3..1882311f86 100644
--- a/xfa/src/fxfa/src/app/xfa_fwltheme.h
+++ b/xfa/src/fxfa/app/xfa_fwltheme.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FWLTHEME_H_
-#define XFA_SRC_FXFA_SRC_APP_XFA_FWLTHEME_H_
+#ifndef XFA_SRC_FXFA_APP_XFA_FWLTHEME_H_
+#define XFA_SRC_FXFA_APP_XFA_FWLTHEME_H_
 
 #include "xfa/include/fwl/core/fwl_target.h"
 #include "xfa/include/fwl/core/fwl_theme.h"
@@ -21,7 +21,7 @@
 #include "xfa/include/fwl/theme/pushbuttontp.h"
 #include "xfa/include/fwl/theme/scrollbartp.h"
 #include "xfa/include/fwl/theme/widgettp.h"
-#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
+#include "xfa/src/fxfa/app/xfa_ffapp.h"
 
 class CXFA_FWLTheme : public IFWL_ThemeProvider {
  public:
@@ -107,4 +107,4 @@ class CXFA_FWLEditTP : public CFWL_EditTP {
   virtual FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams);
 };
 
-#endif  // XFA_SRC_FXFA_SRC_APP_XFA_FWLTHEME_H_
+#endif  // XFA_SRC_FXFA_APP_XFA_FWLTHEME_H_
diff --git a/xfa/src/fxfa/src/app/xfa_rendercontext.cpp b/xfa/src/fxfa/app/xfa_rendercontext.cpp
index def0c78d22..cc5402eb99 100644
--- a/xfa/src/fxfa/src/app/xfa_rendercontext.cpp
+++ b/xfa/src/fxfa/app/xfa_rendercontext.cpp
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/app/xfa_rendercontext.h"
+#include "xfa/src/fxfa/app/xfa_rendercontext.h"
 
 #include "xfa/include/fxgraphics/fx_graphics.h"
-#include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
+#include "xfa/src/fxfa/app/xfa_ffwidget.h"
 
 #define XFA_RENDERCONTEXT_MaxCount 30
 
diff --git a/xfa/src/fxfa/src/app/xfa_rendercontext.h b/xfa/src/fxfa/app/xfa_rendercontext.h
index 67ec9cbb0b..9ed975c1fa 100644
--- a/xfa/src/fxfa/src/app/xfa_rendercontext.h
+++ b/xfa/src/fxfa/app/xfa_rendercontext.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_APP_XFA_RENDERCONTEXT_H_
-#define XFA_SRC_FXFA_SRC_APP_XFA_RENDERCONTEXT_H_
+#ifndef XFA_SRC_FXFA_APP_XFA_RENDERCONTEXT_H_
+#define XFA_SRC_FXFA_APP_XFA_RENDERCONTEXT_H_
 
 #include "xfa/include/fxfa/fxfa.h"
 
@@ -32,4 +32,4 @@ class CXFA_RenderContext : public IXFA_RenderContext {
   CFX_RectF m_rtClipRect;
 };
 
-#endif  // XFA_SRC_FXFA_SRC_APP_XFA_RENDERCONTEXT_H_
+#endif  // XFA_SRC_FXFA_APP_XFA_RENDERCONTEXT_H_
diff --git a/xfa/src/fxfa/src/app/xfa_textlayout.cpp b/xfa/src/fxfa/app/xfa_textlayout.cpp
index 7d03cddeb9..0ccb4e99d3 100644
--- a/xfa/src/fxfa/src/app/xfa_textlayout.cpp
+++ b/xfa/src/fxfa/app/xfa_textlayout.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/app/xfa_textlayout.h"
+#include "xfa/src/fxfa/app/xfa_textlayout.h"
 
 #include <algorithm>
 
@@ -12,9 +12,9 @@
 #include "xfa/src/fdp/include/fde_pen.h"
 #include "xfa/src/fgas/include/fx_alg.h"
 #include "xfa/src/fgas/include/fx_cpg.h"
-#include "xfa/src/fxfa/src/app/xfa_ffapp.h"
-#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
-#include "xfa/src/fxfa/src/app/xfa_fontmgr.h"
+#include "xfa/src/fxfa/app/xfa_ffapp.h"
+#include "xfa/src/fxfa/app/xfa_ffdoc.h"
+#include "xfa/src/fxfa/app/xfa_fontmgr.h"
 
 CXFA_CSSTagProvider::~CXFA_CSSTagProvider() {
   FX_POSITION pos = m_Attributes.GetStartPosition();
diff --git a/xfa/src/fxfa/src/app/xfa_textlayout.h b/xfa/src/fxfa/app/xfa_textlayout.h
index d096a645a7..c4ad1e138b 100644
--- a/xfa/src/fxfa/src/app/xfa_textlayout.h
+++ b/xfa/src/fxfa/app/xfa_textlayout.h
@@ -4,15 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_APP_XFA_TEXTLAYOUT_H_
-#define XFA_SRC_FXFA_SRC_APP_XFA_TEXTLAYOUT_H_
+#ifndef XFA_SRC_FXFA_APP_XFA_TEXTLAYOUT_H_
+#define XFA_SRC_FXFA_APP_XFA_TEXTLAYOUT_H_
 
 #include "xfa/src/fdp/include/fde_brs.h"
 #include "xfa/src/fdp/include/fde_css.h"
 #include "xfa/src/fdp/include/fde_rdv.h"
 #include "xfa/src/fgas/include/fx_rbk.h"
-#include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
-#include "xfa/src/fxfa/src/common/xfa_object.h"
+#include "xfa/src/fxfa/app/xfa_ffdoc.h"
+#include "xfa/src/fxfa/parser/xfa_object.h"
 
 #define XFA_LOADERCNTXTFLG_FILTERSPACE 0x001
 
@@ -421,4 +421,4 @@ class CXFA_TextLayout {
   FX_BOOL m_bBlockContinue;
 };
 
-#endif  // XFA_SRC_FXFA_SRC_APP_XFA_TEXTLAYOUT_H_
+#endif  // XFA_SRC_FXFA_APP_XFA_TEXTLAYOUT_H_
diff --git a/xfa/src/fxfa/src/fm2js/xfa_error.cpp b/xfa/src/fxfa/fm2js/xfa_error.cpp
index 03423b0673..71706dff5d 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_error.cpp
+++ b/xfa/src/fxfa/fm2js/xfa_error.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/fm2js/xfa_error.h"
+#include "xfa/src/fxfa/fm2js/xfa_error.h"
 
 static const FX_WCHAR* const gs_lpStrErrorMsgInfo[] = {
     L"unsupported char '%c'",         L"bad suffix on number",
diff --git a/xfa/src/fxfa/src/fm2js/xfa_error.h b/xfa/src/fxfa/fm2js/xfa_error.h
index 8907ad872f..7c11080a09 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_error.h
+++ b/xfa/src/fxfa/fm2js/xfa_error.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_FM2JS_XFA_ERROR_H_
-#define XFA_SRC_FXFA_SRC_FM2JS_XFA_ERROR_H_
+#ifndef XFA_SRC_FXFA_FM2JS_XFA_ERROR_H_
+#define XFA_SRC_FXFA_FM2JS_XFA_ERROR_H_
 
 #include "core/include/fxcrt/fx_string.h"
 #include "core/include/fxcrt/fx_system.h"
@@ -32,4 +32,4 @@ class CXFA_FMErrorInfo {
 };
 const FX_WCHAR* XFA_FM_ErrorMsg(XFA_FM_ERRMSG msg);
 
-#endif  // XFA_SRC_FXFA_SRC_FM2JS_XFA_ERROR_H_
+#endif  // XFA_SRC_FXFA_FM2JS_XFA_ERROR_H_
diff --git a/xfa/src/fxfa/src/fm2js/xfa_expression.cpp b/xfa/src/fxfa/fm2js/xfa_expression.cpp
index 93b604df7e..25c5b4b63b 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_expression.cpp
+++ b/xfa/src/fxfa/fm2js/xfa_expression.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/fm2js/xfa_expression.h"
+#include "xfa/src/fxfa/fm2js/xfa_expression.h"
 
 #include "core/include/fxcrt/fx_basic.h"
 
@@ -19,12 +19,10 @@ const CFX_WideStringC RUNTIMEBLOCKTEMPARRAYINDEX =
 }  // namespace
 
 CXFA_FMExpression::CXFA_FMExpression(FX_DWORD line)
-    : m_type(XFA_FM_EXPTYPE_UNKNOWN), m_line(line) {
-}
+    : m_type(XFA_FM_EXPTYPE_UNKNOWN), m_line(line) {}
 
 CXFA_FMExpression::CXFA_FMExpression(FX_DWORD line, XFA_FM_EXPTYPE type)
-    : m_type(type), m_line(line) {
-}
+    : m_type(type), m_line(line) {}
 
 void CXFA_FMExpression::ToJavaScript(CFX_WideTextBuf& javascript) {}
 
@@ -40,8 +38,7 @@ CXFA_FMFunctionDefinition::CXFA_FMFunctionDefinition(
       m_wsName(wsName),
       m_pArguments(pArguments),
       m_pExpressions(pExpressions),
-      m_isGlobal(isGlobal) {
-}
+      m_isGlobal(isGlobal) {}
 
 CXFA_FMFunctionDefinition::~CXFA_FMFunctionDefinition() {
   if (m_pArguments) {
@@ -358,8 +355,7 @@ void CXFA_FMWhileExpression::ToImpliedReturnJS(CFX_WideTextBuf& javascript) {
 }
 
 CXFA_FMBreakExpression::CXFA_FMBreakExpression(FX_DWORD line)
-    : CXFA_FMExpression(line, XFA_FM_EXPTYPE_BREAK) {
-}
+    : CXFA_FMExpression(line, XFA_FM_EXPTYPE_BREAK) {}
 
 CXFA_FMBreakExpression::~CXFA_FMBreakExpression() {}
 
@@ -376,8 +372,7 @@ void CXFA_FMBreakExpression::ToImpliedReturnJS(CFX_WideTextBuf& javascript) {
 }
 
 CXFA_FMContinueExpression::CXFA_FMContinueExpression(FX_DWORD line)
-    : CXFA_FMExpression(line, XFA_FM_EXPTYPE_CONTINUE) {
-}
+    : CXFA_FMExpression(line, XFA_FM_EXPTYPE_CONTINUE) {}
 
 CXFA_FMContinueExpression::~CXFA_FMContinueExpression() {}
 
diff --git a/xfa/src/fxfa/src/fm2js/xfa_expression.h b/xfa/src/fxfa/fm2js/xfa_expression.h
index 8fe251271b..ffcce1c4e0 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_expression.h
+++ b/xfa/src/fxfa/fm2js/xfa_expression.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_FM2JS_XFA_EXPRESSION_H_
-#define XFA_SRC_FXFA_SRC_FM2JS_XFA_EXPRESSION_H_
+#ifndef XFA_SRC_FXFA_FM2JS_XFA_EXPRESSION_H_
+#define XFA_SRC_FXFA_FM2JS_XFA_EXPRESSION_H_
 
 #include <memory>
 
-#include "xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h"
+#include "xfa/src/fxfa/fm2js/xfa_simpleexpression.h"
 
 enum XFA_FM_EXPTYPE {
   XFA_FM_EXPTYPE_UNKNOWN,
@@ -188,4 +188,4 @@ class CXFA_FMForeachExpression : public CXFA_FMLoopExpression {
   std::unique_ptr<CXFA_FMExpression> m_pList;
 };
 
-#endif  // XFA_SRC_FXFA_SRC_FM2JS_XFA_EXPRESSION_H_
+#endif  // XFA_SRC_FXFA_FM2JS_XFA_EXPRESSION_H_
diff --git a/xfa/src/fxfa/src/fm2js/xfa_fm2jsapi.cpp b/xfa/src/fxfa/fm2js/xfa_fm2jsapi.cpp
index 146a4a3643..c59aedc6ac 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_fm2jsapi.cpp
+++ b/xfa/src/fxfa/fm2js/xfa_fm2jsapi.cpp
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
+#include "xfa/src/fxfa/fm2js/xfa_fm2jsapi.h"
 
 #include "core/include/fxcrt/fx_basic.h"
-#include "xfa/src/fxfa/src/common/xfa_document.h"
-#include "xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.h"
-#include "xfa/src/fxfa/src/fm2js/xfa_program.h"
+#include "xfa/src/fxfa/fm2js/xfa_fm2jscontext.h"
+#include "xfa/src/fxfa/fm2js/xfa_program.h"
+#include "xfa/src/fxfa/parser/xfa_document.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/xfa/src/fxfa/src/common/xfa_fm2jsapi.h b/xfa/src/fxfa/fm2js/xfa_fm2jsapi.h
index f392c5cdbf..ce6d7c9a93 100644
--- a/xfa/src/fxfa/src/common/xfa_fm2jsapi.h
+++ b/xfa/src/fxfa/fm2js/xfa_fm2jsapi.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_FM2JSAPI_H_
-#define XFA_SRC_FXFA_SRC_COMMON_XFA_FM2JSAPI_H_
+#ifndef XFA_SRC_FXFA_FM2JS_XFA_FM2JSAPI_H_
+#define XFA_SRC_FXFA_FM2JS_XFA_FM2JSAPI_H_
 
 #include "core/include/fxcrt/fx_basic.h"
 #include "xfa/include/fxjse/fxjse.h"
-#include "xfa/src/fxfa/src/common/xfa_document.h"
+#include "xfa/src/fxfa/parser/xfa_document.h"
 
 #define FOXIT_XFA_FM2JS_FORMCALC_RUNTIME "foxit_xfa_formcalc_runtime"
 
@@ -34,4 +34,4 @@ void XFA_FM2JS_ContextRelease(XFA_HFM2JSCONTEXT hFM2JSContext);
 }
 #endif
 
-#endif  // XFA_SRC_FXFA_SRC_COMMON_XFA_FM2JSAPI_H_
+#endif  // XFA_SRC_FXFA_FM2JS_XFA_FM2JSAPI_H_
diff --git a/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp b/xfa/src/fxfa/fm2js/xfa_fm2jscontext.cpp
index 1c80e62cf9..2af975f888 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp
+++ b/xfa/src/fxfa/fm2js/xfa_fm2jscontext.cpp
@@ -4,16 +4,16 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.h"
+#include "xfa/src/fxfa/fm2js/xfa_fm2jscontext.h"
 
 #include <time.h>
 
 #include "core/include/fxcrt/fx_ext.h"
 #include "xfa/src/fgas/include/fx_locale.h"
-#include "xfa/src/fxfa/src/common/fxfa_localevalue.h"
-#include "xfa/src/fxfa/src/common/xfa_document.h"
-#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
-#include "xfa/src/fxfa/src/common/xfa_parser.h"
+#include "xfa/src/fxfa/fm2js/xfa_fm2jsapi.h"
+#include "xfa/src/fxfa/parser/xfa_document.h"
+#include "xfa/src/fxfa/parser/xfa_localevalue.h"
+#include "xfa/src/fxfa/parser/xfa_parser.h"
 
 #define FINANCIAL_PRECISION 0.00000001
 
@@ -1362,8 +1362,8 @@ void CXFA_FM2JSContext::Num2Date(FXJSE_HOBJECT hThis,
       CFX_ByteString szIsoDateString;
       szIsoDateString.Format("%d%02d%02d", iYear + i, iMonth, iDay);
       CFX_ByteString szLocalDateString;
-      IsoDate2Local(hThis, szIsoDateString, formatString,
-                    localString, szLocalDateString);
+      IsoDate2Local(hThis, szIsoDateString, formatString, localString,
+                    szLocalDateString);
       if (szLocalDateString.IsEmpty()) {
         szLocalDateString = "";
       }
diff --git a/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.h b/xfa/src/fxfa/fm2js/xfa_fm2jscontext.h
index da6df4f102..62c2a1e895 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.h
+++ b/xfa/src/fxfa/fm2js/xfa_fm2jscontext.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_FM2JS_XFA_FM2JSCONTEXT_H_
-#define XFA_SRC_FXFA_SRC_FM2JS_XFA_FM2JSCONTEXT_H_
+#ifndef XFA_SRC_FXFA_FM2JS_XFA_FM2JSCONTEXT_H_
+#define XFA_SRC_FXFA_FM2JS_XFA_FM2JSCONTEXT_H_
 
-#include "xfa/src/fxfa/src/common/xfa_script.h"
+#include "xfa/src/fxfa/parser/xfa_script.h"
 
 class CXFA_FM2JSContext {
  public:
@@ -450,4 +450,4 @@ class CXFA_FM2JSContext {
   CXFA_Document* m_pDocument;
 };
 
-#endif  // XFA_SRC_FXFA_SRC_FM2JS_XFA_FM2JSCONTEXT_H_
+#endif  // XFA_SRC_FXFA_FM2JS_XFA_FM2JSCONTEXT_H_
diff --git a/xfa/src/fxfa/src/fm2js/xfa_fmparse.cpp b/xfa/src/fxfa/fm2js/xfa_fmparse.cpp
index bd2c206f03..7950abbd16 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_fmparse.cpp
+++ b/xfa/src/fxfa/fm2js/xfa_fmparse.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/fm2js/xfa_fmparse.h"
+#include "xfa/src/fxfa/fm2js/xfa_fmparse.h"
 
 #include <memory>
 
diff --git a/xfa/src/fxfa/src/fm2js/xfa_fmparse.h b/xfa/src/fxfa/fm2js/xfa_fmparse.h
index 3b8a0586f3..7494cd0b83 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_fmparse.h
+++ b/xfa/src/fxfa/fm2js/xfa_fmparse.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_FM2JS_XFA_FMPARSE_H_
-#define XFA_SRC_FXFA_SRC_FM2JS_XFA_FMPARSE_H_
+#ifndef XFA_SRC_FXFA_FM2JS_XFA_FMPARSE_H_
+#define XFA_SRC_FXFA_FM2JS_XFA_FMPARSE_H_
 
 #include <memory>
 
-#include "xfa/src/fxfa/src/fm2js/xfa_expression.h"
-#include "xfa/src/fxfa/src/fm2js/xfa_lexer.h"
+#include "xfa/src/fxfa/fm2js/xfa_expression.h"
+#include "xfa/src/fxfa/fm2js/xfa_lexer.h"
 
 class CXFA_FMParse {
  public:
@@ -50,4 +50,4 @@ class CXFA_FMParse {
   CXFA_FMErrorInfo* m_pErrorInfo;
 };
 
-#endif  // XFA_SRC_FXFA_SRC_FM2JS_XFA_FMPARSE_H_
+#endif  // XFA_SRC_FXFA_FM2JS_XFA_FMPARSE_H_
diff --git a/xfa/src/fxfa/src/fm2js/xfa_lexer.cpp b/xfa/src/fxfa/fm2js/xfa_lexer.cpp
index 0afdeb6e9f..f93fa839d3 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_lexer.cpp
+++ b/xfa/src/fxfa/fm2js/xfa_lexer.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/fm2js/xfa_lexer.h"
+#include "xfa/src/fxfa/fm2js/xfa_lexer.h"
 
 #include "core/include/fxcrt/fx_ext.h"
 
diff --git a/xfa/src/fxfa/src/fm2js/xfa_lexer.h b/xfa/src/fxfa/fm2js/xfa_lexer.h
index 841d27307a..f45f639e38 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_lexer.h
+++ b/xfa/src/fxfa/fm2js/xfa_lexer.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_FM2JS_XFA_LEXER_H_
-#define XFA_SRC_FXFA_SRC_FM2JS_XFA_LEXER_H_
+#ifndef XFA_SRC_FXFA_FM2JS_XFA_LEXER_H_
+#define XFA_SRC_FXFA_FM2JS_XFA_LEXER_H_
 
 #include <memory>
 
 #include "core/include/fxcrt/fx_string.h"
-#include "xfa/src/fxfa/src/fm2js/xfa_error.h"
+#include "xfa/src/fxfa/fm2js/xfa_error.h"
 
 enum XFA_FM_TOKEN {
   TOKand,
@@ -131,4 +131,4 @@ class CXFA_FMLexer {
   CXFA_FMErrorInfo* m_pErrorInfo;
 };
 
-#endif  // XFA_SRC_FXFA_SRC_FM2JS_XFA_LEXER_H_
+#endif  // XFA_SRC_FXFA_FM2JS_XFA_LEXER_H_
diff --git a/xfa/src/fxfa/src/fm2js/xfa_program.cpp b/xfa/src/fxfa/fm2js/xfa_program.cpp
index fe592dcbd7..ce06c4d99d 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_program.cpp
+++ b/xfa/src/fxfa/fm2js/xfa_program.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/fm2js/xfa_program.h"
+#include "xfa/src/fxfa/fm2js/xfa_program.h"
 
 CXFA_FMProgram::CXFA_FMProgram() : m_globalFunction(0) {}
 CXFA_FMProgram::~CXFA_FMProgram() {
diff --git a/xfa/src/fxfa/src/fm2js/xfa_program.h b/xfa/src/fxfa/fm2js/xfa_program.h
index e1f62bbed8..3cd7cc4d0b 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_program.h
+++ b/xfa/src/fxfa/fm2js/xfa_program.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_FM2JS_XFA_PROGRAM_H_
-#define XFA_SRC_FXFA_SRC_FM2JS_XFA_PROGRAM_H_
+#ifndef XFA_SRC_FXFA_FM2JS_XFA_PROGRAM_H_
+#define XFA_SRC_FXFA_FM2JS_XFA_PROGRAM_H_
 
-#include "xfa/src/fxfa/src/fm2js/xfa_error.h"
-#include "xfa/src/fxfa/src/fm2js/xfa_fmparse.h"
+#include "xfa/src/fxfa/fm2js/xfa_error.h"
+#include "xfa/src/fxfa/fm2js/xfa_fmparse.h"
 
 class CXFA_FMProgram {
  public:
@@ -25,4 +25,4 @@ class CXFA_FMProgram {
   CXFA_FMFunctionDefinition* m_globalFunction;
 };
 
-#endif  // XFA_SRC_FXFA_SRC_FM2JS_XFA_PROGRAM_H_
+#endif  // XFA_SRC_FXFA_FM2JS_XFA_PROGRAM_H_
diff --git a/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.cpp b/xfa/src/fxfa/fm2js/xfa_simpleexpression.cpp
index f849f791ee..376a8f7a32 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.cpp
+++ b/xfa/src/fxfa/fm2js/xfa_simpleexpression.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h"
+#include "xfa/src/fxfa/fm2js/xfa_simpleexpression.h"
 
 #include "core/include/fxcrt/fx_ext.h"
 
@@ -469,8 +469,7 @@ CXFA_FMCallExpression::CXFA_FMCallExpression(FX_DWORD line,
                                              FX_BOOL bIsSomMethod)
     : CXFA_FMUnaryExpression(line, TOKcall, pExp),
       m_bIsSomMethod(bIsSomMethod),
-      m_pArguments(pArguments) {
-}
+      m_pArguments(pArguments) {}
 
 CXFA_FMCallExpression::~CXFA_FMCallExpression() {
   if (m_pArguments) {
diff --git a/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h b/xfa/src/fxfa/fm2js/xfa_simpleexpression.h
index df27a630b8..152fe3d5e7 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h
+++ b/xfa/src/fxfa/fm2js/xfa_simpleexpression.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_FM2JS_XFA_SIMPLEEXPRESSION_H_
-#define XFA_SRC_FXFA_SRC_FM2JS_XFA_SIMPLEEXPRESSION_H_
+#ifndef XFA_SRC_FXFA_FM2JS_XFA_SIMPLEEXPRESSION_H_
+#define XFA_SRC_FXFA_FM2JS_XFA_SIMPLEEXPRESSION_H_
 
 #include <memory>
 
 #include "core/include/fxcrt/fx_basic.h"
-#include "xfa/src/fxfa/src/fm2js/xfa_lexer.h"
+#include "xfa/src/fxfa/fm2js/xfa_lexer.h"
 
 #define RUNTIMEFUNCTIONRETURNVALUE \
   (FX_WSTRC(L"foxit_xfa_formcalc_runtime_func_return_value"))
@@ -289,4 +289,4 @@ class CXFA_FMMethodCallExpression : public CXFA_FMBinExpression {
   void ToJavaScript(CFX_WideTextBuf& javascript) override;
 };
 
-#endif  // XFA_SRC_FXFA_SRC_FM2JS_XFA_SIMPLEEXPRESSION_H_
+#endif  // XFA_SRC_FXFA_FM2JS_XFA_SIMPLEEXPRESSION_H_
diff --git a/xfa/src/fxfa/src/parser/xfa_basic_data.cpp b/xfa/src/fxfa/parser/xfa_basic_data.cpp
index 891eaf6a96..418ebf374b 100644
--- a/xfa/src/fxfa/src/parser/xfa_basic_data.cpp
+++ b/xfa/src/fxfa/parser/xfa_basic_data.cpp
@@ -4,24 +4,25 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/parser/xfa_basic_data.h"
+#include "xfa/src/fxfa/parser/xfa_basic_data.h"
+
+#include "xfa/src/fxfa/fm2js/xfa_fm2jsapi.h"
+#include "xfa/src/fxfa/parser/xfa_basic_imp.h"
+#include "xfa/src/fxfa/parser/xfa_docdata.h"
+#include "xfa/src/fxfa/parser/xfa_doclayout.h"
+#include "xfa/src/fxfa/parser/xfa_document.h"
+#include "xfa/src/fxfa/parser/xfa_localemgr.h"
+#include "xfa/src/fxfa/parser/xfa_object.h"
+#include "xfa/src/fxfa/parser/xfa_parser.h"
+#include "xfa/src/fxfa/parser/xfa_script.h"
+#include "xfa/src/fxfa/parser/xfa_script_datawindow.h"
+#include "xfa/src/fxfa/parser/xfa_script_eventpseudomodel.h"
+#include "xfa/src/fxfa/parser/xfa_script_hostpseudomodel.h"
+#include "xfa/src/fxfa/parser/xfa_script_layoutpseudomodel.h"
+#include "xfa/src/fxfa/parser/xfa_script_logpseudomodel.h"
+#include "xfa/src/fxfa/parser/xfa_script_signaturepseudomodel.h"
+#include "xfa/src/fxfa/parser/xfa_utils.h"
 
-#include "xfa/src/fxfa/src/common/xfa_docdata.h"
-#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
-#include "xfa/src/fxfa/src/common/xfa_document.h"
-#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
-#include "xfa/src/fxfa/src/common/xfa_localemgr.h"
-#include "xfa/src/fxfa/src/common/xfa_object.h"
-#include "xfa/src/fxfa/src/common/xfa_parser.h"
-#include "xfa/src/fxfa/src/common/xfa_script.h"
-#include "xfa/src/fxfa/src/common/xfa_utils.h"
-#include "xfa/src/fxfa/src/parser/xfa_basic_imp.h"
-#include "xfa/src/fxfa/src/parser/xfa_script_datawindow.h"
-#include "xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.h"
-#include "xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.h"
-#include "xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.h"
-#include "xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.h"
-#include "xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.h"
 const XFA_ATTRIBUTEENUMINFO g_XFAEnumData[] = {
     {0x2a, L"*", XFA_ATTRIBUTEENUM_Asterisk},
     {0x2f, L"/", XFA_ATTRIBUTEENUM_Slash},
diff --git a/xfa/src/fxfa/src/parser/xfa_basic_data.h b/xfa/src/fxfa/parser/xfa_basic_data.h
index 3e8b112a2b..4ccdd1c7c8 100644
--- a/xfa/src/fxfa/src/parser/xfa_basic_data.h
+++ b/xfa/src/fxfa/parser/xfa_basic_data.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_BASIC_DATA_H_
-#define XFA_SRC_FXFA_SRC_PARSER_XFA_BASIC_DATA_H_
+#ifndef XFA_SRC_FXFA_PARSER_XFA_BASIC_DATA_H_
+#define XFA_SRC_FXFA_PARSER_XFA_BASIC_DATA_H_
 
 #include "xfa/include/fxfa/fxfa_basic.h"
-#include "xfa/src/fxfa/src/parser/xfa_basic_imp.h"
+#include "xfa/src/fxfa/parser/xfa_basic_imp.h"
 
 extern const XFA_PACKETINFO g_XFAPacketData[];
 extern const int32_t g_iXFAPacketCount;
@@ -45,4 +45,4 @@ extern const int32_t g_iSomMethodCount;
 extern const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[];
 extern const int32_t g_iSomAttributeCount;
 
-#endif  // XFA_SRC_FXFA_SRC_PARSER_XFA_BASIC_DATA_H_
+#endif  // XFA_SRC_FXFA_PARSER_XFA_BASIC_DATA_H_
diff --git a/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp b/xfa/src/fxfa/parser/xfa_basic_imp.cpp
index 8ec881ed6c..dc4c8d1778 100644
--- a/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp
+++ b/xfa/src/fxfa/parser/xfa_basic_imp.cpp
@@ -4,22 +4,22 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/parser/xfa_basic_imp.h"
+#include "xfa/src/fxfa/parser/xfa_basic_imp.h"
 
 #include "core/include/fxcrt/fx_ext.h"
 #include "xfa/src/fgas/include/fx_alg.h"
 #include "xfa/src/fgas/include/fx_cpg.h"
 #include "xfa/src/fgas/include/fx_sys.h"
-#include "xfa/src/fxfa/src/common/xfa_docdata.h"
-#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
-#include "xfa/src/fxfa/src/common/xfa_document.h"
-#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
-#include "xfa/src/fxfa/src/common/xfa_localemgr.h"
-#include "xfa/src/fxfa/src/common/xfa_object.h"
-#include "xfa/src/fxfa/src/common/xfa_parser.h"
-#include "xfa/src/fxfa/src/common/xfa_script.h"
-#include "xfa/src/fxfa/src/common/xfa_utils.h"
-#include "xfa/src/fxfa/src/parser/xfa_basic_data.h"
+#include "xfa/src/fxfa/fm2js/xfa_fm2jsapi.h"
+#include "xfa/src/fxfa/parser/xfa_basic_data.h"
+#include "xfa/src/fxfa/parser/xfa_docdata.h"
+#include "xfa/src/fxfa/parser/xfa_doclayout.h"
+#include "xfa/src/fxfa/parser/xfa_document.h"
+#include "xfa/src/fxfa/parser/xfa_localemgr.h"
+#include "xfa/src/fxfa/parser/xfa_object.h"
+#include "xfa/src/fxfa/parser/xfa_parser.h"
+#include "xfa/src/fxfa/parser/xfa_script.h"
+#include "xfa/src/fxfa/parser/xfa_utils.h"
 
 const XFA_PACKETINFO* XFA_GetPacketByName(const CFX_WideStringC& wsName) {
   int32_t iLength = wsName.GetLength();
diff --git a/xfa/src/fxfa/src/parser/xfa_basic_imp.h b/xfa/src/fxfa/parser/xfa_basic_imp.h
index fb24d7c4eb..55b3c1d4cb 100644
--- a/xfa/src/fxfa/src/parser/xfa_basic_imp.h
+++ b/xfa/src/fxfa/parser/xfa_basic_imp.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_BASIC_IMP_H_
-#define XFA_SRC_FXFA_SRC_PARSER_XFA_BASIC_IMP_H_
+#ifndef XFA_SRC_FXFA_PARSER_XFA_BASIC_IMP_H_
+#define XFA_SRC_FXFA_PARSER_XFA_BASIC_IMP_H_
 
 #include "xfa/include/fxfa/fxfa_basic.h"
 #include "xfa/src/fgas/include/fx_stm.h"
@@ -68,4 +68,4 @@ class CXFA_WideTextRead : public IFX_Stream {
   int32_t m_iRefCount;
 };
 
-#endif  // XFA_SRC_FXFA_SRC_PARSER_XFA_BASIC_IMP_H_
+#endif  // XFA_SRC_FXFA_PARSER_XFA_BASIC_IMP_H_
diff --git a/xfa/src/fxfa/src/common/xfa_docdata.h b/xfa/src/fxfa/parser/xfa_docdata.h
index 2c23d96b70..5c6cf13dfe 100644
--- a/xfa/src/fxfa/src/common/xfa_docdata.h
+++ b/xfa/src/fxfa/parser/xfa_docdata.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_DOCDATA_H_
-#define XFA_SRC_FXFA_SRC_COMMON_XFA_DOCDATA_H_
+#ifndef XFA_SRC_FXFA_PARSER_XFA_DOCDATA_H_
+#define XFA_SRC_FXFA_PARSER_XFA_DOCDATA_H_
 
-#include "xfa/src/fxfa/src/common/xfa_document.h"
+#include "xfa/src/fxfa/parser/xfa_document.h"
 
 enum XFA_DATAFORMAT {
   XFA_DATAFORMAT_XDP,
@@ -33,4 +33,4 @@ class IXFA_PacketImport {
   virtual FX_BOOL ImportData(IFX_FileRead* pDataDocument) = 0;
 };
 
-#endif  // XFA_SRC_FXFA_SRC_COMMON_XFA_DOCDATA_H_
+#endif  // XFA_SRC_FXFA_PARSER_XFA_DOCDATA_H_
diff --git a/xfa/src/fxfa/src/common/xfa_doclayout.h b/xfa/src/fxfa/parser/xfa_doclayout.h
index b115c81f7a..1ebe412078 100644
--- a/xfa/src/fxfa/src/common/xfa_doclayout.h
+++ b/xfa/src/fxfa/parser/xfa_doclayout.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_DOCLAYOUT_H_
-#define XFA_SRC_FXFA_SRC_COMMON_XFA_DOCLAYOUT_H_
+#ifndef XFA_SRC_FXFA_PARSER_XFA_DOCLAYOUT_H_
+#define XFA_SRC_FXFA_PARSER_XFA_DOCLAYOUT_H_
 
-#include "xfa/src/fxfa/src/common/xfa_document.h"
+#include "xfa/src/fxfa/parser/xfa_document.h"
 
 class CXFA_ContainerLayoutItem;
 class CXFA_ContentLayoutItem;
@@ -133,4 +133,4 @@ class IXFA_DocLayout {
   virtual CXFA_LayoutItem* GetLayoutItem(CXFA_Node* pFormItem) = 0;
 };
 
-#endif  // XFA_SRC_FXFA_SRC_COMMON_XFA_DOCLAYOUT_H_
+#endif  // XFA_SRC_FXFA_PARSER_XFA_DOCLAYOUT_H_
diff --git a/xfa/src/fxfa/src/common/xfa_document.h b/xfa/src/fxfa/parser/xfa_document.h
index 62e7e8ce6e..d17c9883c9 100644
--- a/xfa/src/fxfa/src/common/xfa_document.h
+++ b/xfa/src/fxfa/parser/xfa_document.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_DOCUMENT_H_
-#define XFA_SRC_FXFA_SRC_COMMON_XFA_DOCUMENT_H_
+#ifndef XFA_SRC_FXFA_PARSER_XFA_DOCUMENT_H_
+#define XFA_SRC_FXFA_PARSER_XFA_DOCUMENT_H_
 
 #include "xfa/include/fxfa/fxfa.h"
-#include "xfa/src/fxfa/src/common/xfa_localemgr.h"
-#include "xfa/src/fxfa/src/common/xfa_object.h"
+#include "xfa/src/fxfa/parser/xfa_localemgr.h"
+#include "xfa/src/fxfa/parser/xfa_object.h"
 
 class CXFA_Document;
 class CXFA_LayoutItem;
@@ -198,4 +198,4 @@ class CXFA_Document : public IXFA_ObjFactory {
   friend class CXFA_SimpleParser;
 };
 
-#endif  // XFA_SRC_FXFA_SRC_COMMON_XFA_DOCUMENT_H_
+#endif  // XFA_SRC_FXFA_PARSER_XFA_DOCUMENT_H_
diff --git a/xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.cpp b/xfa/src/fxfa/parser/xfa_document_datadescription_imp.cpp
index 27cc8f0c9c..321fbbd466 100644
--- a/xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.cpp
+++ b/xfa/src/fxfa/parser/xfa_document_datadescription_imp.cpp
@@ -4,15 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/common/xfa_docdata.h"
-#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
-#include "xfa/src/fxfa/src/common/xfa_document.h"
-#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
-#include "xfa/src/fxfa/src/common/xfa_localemgr.h"
-#include "xfa/src/fxfa/src/common/xfa_object.h"
-#include "xfa/src/fxfa/src/common/xfa_parser.h"
-#include "xfa/src/fxfa/src/common/xfa_script.h"
-#include "xfa/src/fxfa/src/common/xfa_utils.h"
+#include "xfa/src/fxfa/fm2js/xfa_fm2jsapi.h"
+#include "xfa/src/fxfa/parser/xfa_docdata.h"
+#include "xfa/src/fxfa/parser/xfa_doclayout.h"
+#include "xfa/src/fxfa/parser/xfa_document.h"
+#include "xfa/src/fxfa/parser/xfa_localemgr.h"
+#include "xfa/src/fxfa/parser/xfa_object.h"
+#include "xfa/src/fxfa/parser/xfa_parser.h"
+#include "xfa/src/fxfa/parser/xfa_script.h"
+#include "xfa/src/fxfa/parser/xfa_utils.h"
 
 #define XFA_HASHCODE_Group 0xf7f75fcd
 
diff --git a/xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.h b/xfa/src/fxfa/parser/xfa_document_datadescription_imp.h
index d890f9247d..bf0b1a45c7 100644
--- a/xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.h
+++ b/xfa/src/fxfa/parser/xfa_document_datadescription_imp.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_DATADESCRIPTION_IMP_H_
-#define XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_DATADESCRIPTION_IMP_H_
+#ifndef XFA_SRC_FXFA_PARSER_XFA_DOCUMENT_DATADESCRIPTION_IMP_H_
+#define XFA_SRC_FXFA_PARSER_XFA_DOCUMENT_DATADESCRIPTION_IMP_H_
 
 void XFA_DataDescription_UpdateDataRelation(CXFA_Node* pDataNode,
                                             CXFA_Node* pDataDescriptionNode);
@@ -15,4 +15,4 @@ CXFA_Node* XFA_DataDescription_MaybeCreateDataNode(
     XFA_ELEMENT eNodeType,
     const CFX_WideStringC& wsName);
 
-#endif  // XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_DATADESCRIPTION_IMP_H_
+#endif  // XFA_SRC_FXFA_PARSER_XFA_DOCUMENT_DATADESCRIPTION_IMP_H_
diff --git a/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp b/xfa/src/fxfa/parser/xfa_document_datamerger_imp.cpp
index da6b57f3d1..ecbbba7579 100644
--- a/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp
+++ b/xfa/src/fxfa/parser/xfa_document_datamerger_imp.cpp
@@ -4,21 +4,21 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.h"
+#include "xfa/src/fxfa/parser/xfa_document_datamerger_imp.h"
 
 #include "core/include/fxcrt/fx_ext.h"
-#include "xfa/src/fxfa/src/common/xfa_docdata.h"
-#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
-#include "xfa/src/fxfa/src/common/xfa_document.h"
-#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
-#include "xfa/src/fxfa/src/common/xfa_localemgr.h"
-#include "xfa/src/fxfa/src/common/xfa_object.h"
-#include "xfa/src/fxfa/src/common/xfa_parser.h"
-#include "xfa/src/fxfa/src/common/xfa_script.h"
-#include "xfa/src/fxfa/src/common/xfa_utils.h"
-#include "xfa/src/fxfa/src/parser/xfa_basic_imp.h"
-#include "xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.h"
-#include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h"
+#include "xfa/src/fxfa/fm2js/xfa_fm2jsapi.h"
+#include "xfa/src/fxfa/parser/xfa_basic_imp.h"
+#include "xfa/src/fxfa/parser/xfa_docdata.h"
+#include "xfa/src/fxfa/parser/xfa_doclayout.h"
+#include "xfa/src/fxfa/parser/xfa_document.h"
+#include "xfa/src/fxfa/parser/xfa_document_datadescription_imp.h"
+#include "xfa/src/fxfa/parser/xfa_document_layout_imp.h"
+#include "xfa/src/fxfa/parser/xfa_localemgr.h"
+#include "xfa/src/fxfa/parser/xfa_object.h"
+#include "xfa/src/fxfa/parser/xfa_parser.h"
+#include "xfa/src/fxfa/parser/xfa_script.h"
+#include "xfa/src/fxfa/parser/xfa_utils.h"
 
 static FX_BOOL XFA_GetOccurInfo(CXFA_Node* pOccurNode,
                                 int32_t& iMin,
diff --git a/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.h b/xfa/src/fxfa/parser/xfa_document_datamerger_imp.h
index 48a08f856c..57ac6385b1 100644
--- a/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.h
+++ b/xfa/src/fxfa/parser/xfa_document_datamerger_imp.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_DATAMERGER_IMP_H_
-#define XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_DATAMERGER_IMP_H_
+#ifndef XFA_SRC_FXFA_PARSER_XFA_DOCUMENT_DATAMERGER_IMP_H_
+#define XFA_SRC_FXFA_PARSER_XFA_DOCUMENT_DATAMERGER_IMP_H_
 
-#include "xfa/src/fxfa/src/common/xfa_object.h"
+#include "xfa/src/fxfa/parser/xfa_object.h"
 
 CXFA_Node* XFA_NodeMerge_CloneOrMergeContainer(
     CXFA_Document* pDocument,
@@ -21,4 +21,4 @@ CXFA_Node* XFA_DataMerge_FindFormDOMInstance(CXFA_Document* pDocument,
                                              FX_DWORD dwNameHash,
                                              CXFA_Node* pFormParent);
 
-#endif  // XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_DATAMERGER_IMP_H_
+#endif  // XFA_SRC_FXFA_PARSER_XFA_DOCUMENT_DATAMERGER_IMP_H_
diff --git a/xfa/src/fxfa/src/parser/xfa_document_imp.cpp b/xfa/src/fxfa/parser/xfa_document_imp.cpp
index 28cf381e7f..980b4e4a3e 100644
--- a/xfa/src/fxfa/src/parser/xfa_document_imp.cpp
+++ b/xfa/src/fxfa/parser/xfa_document_imp.cpp
@@ -5,23 +5,23 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/include/fxcrt/fx_ext.h"
-#include "xfa/src/fxfa/src/common/xfa_docdata.h"
-#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
-#include "xfa/src/fxfa/src/common/xfa_document.h"
-#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
-#include "xfa/src/fxfa/src/common/xfa_localemgr.h"
-#include "xfa/src/fxfa/src/common/xfa_object.h"
-#include "xfa/src/fxfa/src/common/xfa_parser.h"
-#include "xfa/src/fxfa/src/common/xfa_script.h"
-#include "xfa/src/fxfa/src/common/xfa_utils.h"
-#include "xfa/src/fxfa/src/parser/xfa_basic_imp.h"
-#include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h"
-#include "xfa/src/fxfa/src/parser/xfa_script_datawindow.h"
-#include "xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.h"
-#include "xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.h"
-#include "xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.h"
-#include "xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.h"
-#include "xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.h"
+#include "xfa/src/fxfa/fm2js/xfa_fm2jsapi.h"
+#include "xfa/src/fxfa/parser/xfa_basic_imp.h"
+#include "xfa/src/fxfa/parser/xfa_docdata.h"
+#include "xfa/src/fxfa/parser/xfa_doclayout.h"
+#include "xfa/src/fxfa/parser/xfa_document.h"
+#include "xfa/src/fxfa/parser/xfa_document_layout_imp.h"
+#include "xfa/src/fxfa/parser/xfa_localemgr.h"
+#include "xfa/src/fxfa/parser/xfa_object.h"
+#include "xfa/src/fxfa/parser/xfa_parser.h"
+#include "xfa/src/fxfa/parser/xfa_script.h"
+#include "xfa/src/fxfa/parser/xfa_script_datawindow.h"
+#include "xfa/src/fxfa/parser/xfa_script_eventpseudomodel.h"
+#include "xfa/src/fxfa/parser/xfa_script_hostpseudomodel.h"
+#include "xfa/src/fxfa/parser/xfa_script_layoutpseudomodel.h"
+#include "xfa/src/fxfa/parser/xfa_script_logpseudomodel.h"
+#include "xfa/src/fxfa/parser/xfa_script_signaturepseudomodel.h"
+#include "xfa/src/fxfa/parser/xfa_utils.h"
 
 CXFA_Document::CXFA_Document(IXFA_DocParser* pParser)
     : m_pParser(pParser),
diff --git a/xfa/src/fxfa/src/parser/xfa_document_layout_imp.cpp b/xfa/src/fxfa/parser/xfa_document_layout_imp.cpp
index 6cb47085fa..2ac2bd6164 100644
--- a/xfa/src/fxfa/src/parser/xfa_document_layout_imp.cpp
+++ b/xfa/src/fxfa/parser/xfa_document_layout_imp.cpp
@@ -4,22 +4,22 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h"
+#include "xfa/src/fxfa/parser/xfa_document_layout_imp.h"
 
-#include "xfa/src/fxfa/src/common/xfa_docdata.h"
-#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
-#include "xfa/src/fxfa/src/common/xfa_document.h"
-#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
-#include "xfa/src/fxfa/src/common/xfa_localemgr.h"
-#include "xfa/src/fxfa/src/common/xfa_object.h"
-#include "xfa/src/fxfa/src/common/xfa_parser.h"
-#include "xfa/src/fxfa/src/common/xfa_script.h"
-#include "xfa/src/fxfa/src/common/xfa_utils.h"
-#include "xfa/src/fxfa/src/parser/xfa_basic_imp.h"
-#include "xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.h"
-#include "xfa/src/fxfa/src/parser/xfa_layout_appadapter.h"
-#include "xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h"
-#include "xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h"
+#include "xfa/src/fxfa/fm2js/xfa_fm2jsapi.h"
+#include "xfa/src/fxfa/parser/xfa_basic_imp.h"
+#include "xfa/src/fxfa/parser/xfa_docdata.h"
+#include "xfa/src/fxfa/parser/xfa_doclayout.h"
+#include "xfa/src/fxfa/parser/xfa_document.h"
+#include "xfa/src/fxfa/parser/xfa_document_datamerger_imp.h"
+#include "xfa/src/fxfa/parser/xfa_layout_appadapter.h"
+#include "xfa/src/fxfa/parser/xfa_layout_itemlayout.h"
+#include "xfa/src/fxfa/parser/xfa_layout_pagemgr_new.h"
+#include "xfa/src/fxfa/parser/xfa_localemgr.h"
+#include "xfa/src/fxfa/parser/xfa_object.h"
+#include "xfa/src/fxfa/parser/xfa_parser.h"
+#include "xfa/src/fxfa/parser/xfa_script.h"
+#include "xfa/src/fxfa/parser/xfa_utils.h"
 
 CXFA_LayoutProcessor* CXFA_Document::GetLayoutProcessor() {
   if (!m_pLayoutProcessor) {
@@ -167,13 +167,10 @@ CXFA_LayoutItem::CXFA_LayoutItem(CXFA_Node* pNode, FX_BOOL bIsContentLayoutItem)
       m_pParent(NULL),
       m_pNextSibling(NULL),
       m_pFirstChild(NULL),
-      m_bIsContentLayoutItem(bIsContentLayoutItem) {
-}
-CXFA_LayoutItem::~CXFA_LayoutItem() {
-}
+      m_bIsContentLayoutItem(bIsContentLayoutItem) {}
+CXFA_LayoutItem::~CXFA_LayoutItem() {}
 CXFA_ContainerLayoutItem::CXFA_ContainerLayoutItem(CXFA_Node* pNode)
-    : CXFA_LayoutItem(pNode, FALSE), m_pOldSubform(NULL) {
-}
+    : CXFA_LayoutItem(pNode, FALSE), m_pOldSubform(NULL) {}
 IXFA_DocLayout* CXFA_ContainerLayoutItem::GetLayout() const {
   return m_pFormNode->GetDocument()->GetLayoutProcessor();
 }
@@ -203,8 +200,7 @@ CXFA_ContentLayoutItem::CXFA_ContentLayoutItem(CXFA_Node* pNode)
     : CXFA_LayoutItem(pNode, TRUE),
       m_pPrev(NULL),
       m_pNext(NULL),
-      m_dwStatus(0) {
-}
+      m_dwStatus(0) {}
 CXFA_ContentLayoutItem::~CXFA_ContentLayoutItem() {
   if (m_pFormNode->GetUserData(XFA_LAYOUTITEMKEY) == this) {
     m_pFormNode->SetUserData(XFA_LAYOUTITEMKEY, NULL);
diff --git a/xfa/src/fxfa/src/parser/xfa_document_layout_imp.h b/xfa/src/fxfa/parser/xfa_document_layout_imp.h
index 7411a9b13c..c471588c97 100644
--- a/xfa/src/fxfa/src/parser/xfa_document_layout_imp.h
+++ b/xfa/src/fxfa/parser/xfa_document_layout_imp.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_LAYOUT_IMP_H_
-#define XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_LAYOUT_IMP_H_
+#ifndef XFA_SRC_FXFA_PARSER_XFA_DOCUMENT_LAYOUT_IMP_H_
+#define XFA_SRC_FXFA_PARSER_XFA_DOCUMENT_LAYOUT_IMP_H_
 
-#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
+#include "xfa/src/fxfa/parser/xfa_doclayout.h"
 
 class CXFA_ItemLayoutProcessor;
 class CXFA_LayoutPageMgr;
@@ -46,4 +46,4 @@ class CXFA_LayoutProcessor : public IXFA_DocLayout {
   FX_BOOL m_bNeeLayout;
 };
 
-#endif  // XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_LAYOUT_IMP_H_
+#endif  // XFA_SRC_FXFA_PARSER_XFA_DOCUMENT_LAYOUT_IMP_H_
diff --git a/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp b/xfa/src/fxfa/parser/xfa_document_serialize.cpp
index 9e54e453fa..53f93f5f71 100644
--- a/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp
+++ b/xfa/src/fxfa/parser/xfa_document_serialize.cpp
@@ -4,18 +4,18 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/parser/xfa_document_serialize.h"
+#include "xfa/src/fxfa/parser/xfa_document_serialize.h"
 
 #include "xfa/src/fgas/include/fx_cpg.h"
-#include "xfa/src/fxfa/src/common/xfa_docdata.h"
-#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
-#include "xfa/src/fxfa/src/common/xfa_document.h"
-#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
-#include "xfa/src/fxfa/src/common/xfa_localemgr.h"
-#include "xfa/src/fxfa/src/common/xfa_object.h"
-#include "xfa/src/fxfa/src/common/xfa_parser.h"
-#include "xfa/src/fxfa/src/common/xfa_script.h"
-#include "xfa/src/fxfa/src/common/xfa_utils.h"
+#include "xfa/src/fxfa/fm2js/xfa_fm2jsapi.h"
+#include "xfa/src/fxfa/parser/xfa_docdata.h"
+#include "xfa/src/fxfa/parser/xfa_doclayout.h"
+#include "xfa/src/fxfa/parser/xfa_document.h"
+#include "xfa/src/fxfa/parser/xfa_localemgr.h"
+#include "xfa/src/fxfa/parser/xfa_object.h"
+#include "xfa/src/fxfa/parser/xfa_parser.h"
+#include "xfa/src/fxfa/parser/xfa_script.h"
+#include "xfa/src/fxfa/parser/xfa_utils.h"
 
 IXFA_PacketImport* IXFA_PacketImport::Create(CXFA_Document* pDocument) {
   return new CXFA_DataImporter(pDocument);
diff --git a/xfa/src/fxfa/src/parser/xfa_document_serialize.h b/xfa/src/fxfa/parser/xfa_document_serialize.h
index 0aa701a175..37dbb9a03b 100644
--- a/xfa/src/fxfa/src/parser/xfa_document_serialize.h
+++ b/xfa/src/fxfa/parser/xfa_document_serialize.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_SERIALIZE_H_
-#define XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_SERIALIZE_H_
+#ifndef XFA_SRC_FXFA_PARSER_XFA_DOCUMENT_SERIALIZE_H_
+#define XFA_SRC_FXFA_PARSER_XFA_DOCUMENT_SERIALIZE_H_
 
-#include "xfa/src/fxfa/src/common/xfa_docdata.h"
+#include "xfa/src/fxfa/parser/xfa_docdata.h"
 
 class CXFA_DataImporter : public IXFA_PacketImport {
  public:
@@ -37,4 +37,4 @@ class CXFA_DataExporter : public IXFA_PacketExport {
   CXFA_Document* m_pDocument;
 };
 
-#endif  // XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_SERIALIZE_H_
+#endif  // XFA_SRC_FXFA_PARSER_XFA_DOCUMENT_SERIALIZE_H_
diff --git a/xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp b/xfa/src/fxfa/parser/xfa_layout_appadapter.cpp
index d5eebd0e0a..bf79c83a38 100644
--- a/xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp
+++ b/xfa/src/fxfa/parser/xfa_layout_appadapter.cpp
@@ -4,20 +4,20 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/parser/xfa_layout_appadapter.h"
+#include "xfa/src/fxfa/parser/xfa_layout_appadapter.h"
 
-#include "xfa/src/fxfa/src/common/xfa_docdata.h"
-#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
-#include "xfa/src/fxfa/src/common/xfa_document.h"
-#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
-#include "xfa/src/fxfa/src/common/xfa_localemgr.h"
-#include "xfa/src/fxfa/src/common/xfa_object.h"
-#include "xfa/src/fxfa/src/common/xfa_parser.h"
-#include "xfa/src/fxfa/src/common/xfa_script.h"
-#include "xfa/src/fxfa/src/common/xfa_utils.h"
-#include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h"
-#include "xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h"
-#include "xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h"
+#include "xfa/src/fxfa/fm2js/xfa_fm2jsapi.h"
+#include "xfa/src/fxfa/parser/xfa_docdata.h"
+#include "xfa/src/fxfa/parser/xfa_doclayout.h"
+#include "xfa/src/fxfa/parser/xfa_document.h"
+#include "xfa/src/fxfa/parser/xfa_document_layout_imp.h"
+#include "xfa/src/fxfa/parser/xfa_layout_itemlayout.h"
+#include "xfa/src/fxfa/parser/xfa_layout_pagemgr_new.h"
+#include "xfa/src/fxfa/parser/xfa_localemgr.h"
+#include "xfa/src/fxfa/parser/xfa_object.h"
+#include "xfa/src/fxfa/parser/xfa_parser.h"
+#include "xfa/src/fxfa/parser/xfa_script.h"
+#include "xfa/src/fxfa/parser/xfa_utils.h"
 
 FX_DWORD XFA_GetRelevant(CXFA_Node* pFormItem, FX_DWORD dwParentRelvant) {
   FX_DWORD dwRelevant = XFA_LAYOUTSTATUS_Viewable | XFA_LAYOUTSTATUS_Printable;
diff --git a/xfa/src/fxfa/src/parser/xfa_layout_appadapter.h b/xfa/src/fxfa/parser/xfa_layout_appadapter.h
index 4221f7f355..94012fae0e 100644
--- a/xfa/src/fxfa/src/parser/xfa_layout_appadapter.h
+++ b/xfa/src/fxfa/parser/xfa_layout_appadapter.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_LAYOUT_APPADAPTER_H_
-#define XFA_SRC_FXFA_SRC_PARSER_XFA_LAYOUT_APPADAPTER_H_
+#ifndef XFA_SRC_FXFA_PARSER_XFA_LAYOUT_APPADAPTER_H_
+#define XFA_SRC_FXFA_PARSER_XFA_LAYOUT_APPADAPTER_H_
 
-#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
+#include "xfa/src/fxfa/parser/xfa_doclayout.h"
 
 class CXFA_TraverseStrategy_PageAreaContainerLayoutItem {
  public:
@@ -74,4 +74,4 @@ class CXFA_TraverseStrategy_ContentLayoutItem {
 FX_DWORD XFA_GetRelevant(CXFA_Node* pFormItem, FX_DWORD dwParentRelvant);
 void XFA_ReleaseLayoutItem(CXFA_LayoutItem* pLayoutItem);
 
-#endif  // XFA_SRC_FXFA_SRC_PARSER_XFA_LAYOUT_APPADAPTER_H_
+#endif  // XFA_SRC_FXFA_PARSER_XFA_LAYOUT_APPADAPTER_H_
diff --git a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp b/xfa/src/fxfa/parser/xfa_layout_itemlayout.cpp
index 3d46f85c8c..16fe2da8ac 100644
--- a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp
+++ b/xfa/src/fxfa/parser/xfa_layout_itemlayout.cpp
@@ -4,24 +4,24 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h"
+#include "xfa/src/fxfa/parser/xfa_layout_itemlayout.h"
 
 #include <algorithm>
 #include <memory>
 
 #include "xfa/src/fgas/include/fx_alg.h"
-#include "xfa/src/fxfa/src/common/xfa_docdata.h"
-#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
-#include "xfa/src/fxfa/src/common/xfa_document.h"
-#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
-#include "xfa/src/fxfa/src/common/xfa_localemgr.h"
-#include "xfa/src/fxfa/src/common/xfa_object.h"
-#include "xfa/src/fxfa/src/common/xfa_parser.h"
-#include "xfa/src/fxfa/src/common/xfa_script.h"
-#include "xfa/src/fxfa/src/common/xfa_utils.h"
-#include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h"
-#include "xfa/src/fxfa/src/parser/xfa_layout_appadapter.h"
-#include "xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h"
+#include "xfa/src/fxfa/fm2js/xfa_fm2jsapi.h"
+#include "xfa/src/fxfa/parser/xfa_docdata.h"
+#include "xfa/src/fxfa/parser/xfa_doclayout.h"
+#include "xfa/src/fxfa/parser/xfa_document.h"
+#include "xfa/src/fxfa/parser/xfa_document_layout_imp.h"
+#include "xfa/src/fxfa/parser/xfa_layout_appadapter.h"
+#include "xfa/src/fxfa/parser/xfa_layout_pagemgr_new.h"
+#include "xfa/src/fxfa/parser/xfa_localemgr.h"
+#include "xfa/src/fxfa/parser/xfa_object.h"
+#include "xfa/src/fxfa/parser/xfa_parser.h"
+#include "xfa/src/fxfa/parser/xfa_script.h"
+#include "xfa/src/fxfa/parser/xfa_utils.h"
 
 CXFA_ItemLayoutProcessor::CXFA_ItemLayoutProcessor(CXFA_Node* pNode,
                                                    CXFA_LayoutPageMgr* pPageMgr)
@@ -292,7 +292,7 @@ void CXFA_ItemLayoutProcessor::SplitLayoutItem(
   FX_FLOAT lHeightForKeep = 0;
   CFX_ArrayTemplate<CXFA_ContentLayoutItem*> keepLayoutItems;
   FX_FLOAT fAddMarginHeight = 0;
-  for (CXFA_ContentLayoutItem* pChildItem = pChildren, * pChildNext = NULL;
+  for (CXFA_ContentLayoutItem *pChildItem = pChildren, *pChildNext = NULL;
        pChildItem; pChildItem = pChildNext) {
     pChildNext = (CXFA_ContentLayoutItem*)pChildItem->m_pNextSibling;
     pChildItem->m_pNextSibling = NULL;
diff --git a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h b/xfa/src/fxfa/parser/xfa_layout_itemlayout.h
index e2048bfc5a..16a91d4f03 100644
--- a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h
+++ b/xfa/src/fxfa/parser/xfa_layout_itemlayout.h
@@ -4,16 +4,16 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_LAYOUT_ITEMLAYOUT_H_
-#define XFA_SRC_FXFA_SRC_PARSER_XFA_LAYOUT_ITEMLAYOUT_H_
+#ifndef XFA_SRC_FXFA_PARSER_XFA_LAYOUT_ITEMLAYOUT_H_
+#define XFA_SRC_FXFA_PARSER_XFA_LAYOUT_ITEMLAYOUT_H_
 
 #include <float.h>
 
 #include <list>
 
 #include "core/include/fxcrt/fx_basic.h"
-#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
-#include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h"
+#include "xfa/src/fxfa/parser/xfa_doclayout.h"
+#include "xfa/src/fxfa/parser/xfa_document_layout_imp.h"
 
 #define XFA_LAYOUT_INVALIDNODE ((CXFA_Node*)(intptr_t)-1)
 #define XFA_LAYOUT_FLOAT_PERCISION (0.0005f)
@@ -192,4 +192,4 @@ class CXFA_ItemLayoutProcessor {
 };
 FX_BOOL XFA_ItemLayoutProcessor_IsTakingSpace(CXFA_Node* pNode);
 
-#endif  // XFA_SRC_FXFA_SRC_PARSER_XFA_LAYOUT_ITEMLAYOUT_H_
+#endif  // XFA_SRC_FXFA_PARSER_XFA_LAYOUT_ITEMLAYOUT_H_
diff --git a/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp b/xfa/src/fxfa/parser/xfa_layout_pagemgr_new.cpp
index 84de094d4e..0ca5af5ca4 100644
--- a/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp
+++ b/xfa/src/fxfa/parser/xfa_layout_pagemgr_new.cpp
@@ -4,21 +4,21 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h"
+#include "xfa/src/fxfa/parser/xfa_layout_pagemgr_new.h"
 
-#include "xfa/src/fxfa/src/common/xfa_docdata.h"
-#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
-#include "xfa/src/fxfa/src/common/xfa_document.h"
-#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
-#include "xfa/src/fxfa/src/common/xfa_localemgr.h"
-#include "xfa/src/fxfa/src/common/xfa_object.h"
-#include "xfa/src/fxfa/src/common/xfa_parser.h"
-#include "xfa/src/fxfa/src/common/xfa_script.h"
-#include "xfa/src/fxfa/src/common/xfa_utils.h"
-#include "xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.h"
-#include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h"
-#include "xfa/src/fxfa/src/parser/xfa_layout_appadapter.h"
-#include "xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h"
+#include "xfa/src/fxfa/fm2js/xfa_fm2jsapi.h"
+#include "xfa/src/fxfa/parser/xfa_docdata.h"
+#include "xfa/src/fxfa/parser/xfa_doclayout.h"
+#include "xfa/src/fxfa/parser/xfa_document.h"
+#include "xfa/src/fxfa/parser/xfa_document_datamerger_imp.h"
+#include "xfa/src/fxfa/parser/xfa_document_layout_imp.h"
+#include "xfa/src/fxfa/parser/xfa_layout_appadapter.h"
+#include "xfa/src/fxfa/parser/xfa_layout_itemlayout.h"
+#include "xfa/src/fxfa/parser/xfa_localemgr.h"
+#include "xfa/src/fxfa/parser/xfa_object.h"
+#include "xfa/src/fxfa/parser/xfa_parser.h"
+#include "xfa/src/fxfa/parser/xfa_script.h"
+#include "xfa/src/fxfa/parser/xfa_utils.h"
 
 CXFA_LayoutPageMgr::CXFA_LayoutPageMgr(CXFA_LayoutProcessor* pLayoutProcessor)
     : m_pLayoutProcessor(pLayoutProcessor),
@@ -30,8 +30,7 @@ CXFA_LayoutPageMgr::CXFA_LayoutPageMgr(CXFA_LayoutProcessor* pLayoutProcessor)
       m_nAvailPages(0),
       m_nCurPageCount(0),
       m_ePageSetMode(XFA_ATTRIBUTEENUM_OrderedOccurrence),
-      m_bCreateOverFlowPage(FALSE) {
-}
+      m_bCreateOverFlowPage(FALSE) {}
 CXFA_LayoutPageMgr::~CXFA_LayoutPageMgr() {
   ClearData();
   CXFA_LayoutItem* pLayoutItem = GetRootLayoutItem();
@@ -356,12 +355,12 @@ CXFA_ContainerRecord* CXFA_LayoutPageMgr::CreateContainerRecord(
       CXFA_ContainerLayoutItem* pParentPageSetLayout = NULL;
       if (pPageSet == GetCurrentContainerRecord()->pCurPageSet->m_pFormNode) {
         pParentPageSetLayout =
-            (CXFA_ContainerLayoutItem*)
-                GetCurrentContainerRecord()->pCurPageSet->m_pParent;
+            (CXFA_ContainerLayoutItem*)GetCurrentContainerRecord()
+                ->pCurPageSet->m_pParent;
       } else {
         pParentPageSetLayout =
             (CXFA_ContainerLayoutItem*)pPageSet->GetNodeItem(
-                                                     XFA_NODEITEM_Parent)
+                                                   XFA_NODEITEM_Parent)
                 ->GetUserData(XFA_LAYOUTITEMKEY);
       }
       CXFA_ContainerLayoutItem* pPageSetLayoutItem =
@@ -1880,7 +1879,7 @@ void CXFA_LayoutPageMgr::SyncLayoutData() {
   ClearRecordList();
 }
 void XFA_ReleaseLayoutItem_NoPageArea(CXFA_LayoutItem* pLayoutItem) {
-  CXFA_LayoutItem* pNext, * pNode = pLayoutItem->m_pFirstChild;
+  CXFA_LayoutItem *pNext, *pNode = pLayoutItem->m_pFirstChild;
   while (pNode) {
     pNext = pNode->m_pNextSibling;
     pNode->m_pParent = NULL;
diff --git a/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h b/xfa/src/fxfa/parser/xfa_layout_pagemgr_new.h
index 5dd83b9556..5f6607f7cc 100644
--- a/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h
+++ b/xfa/src/fxfa/parser/xfa_layout_pagemgr_new.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_LAYOUT_PAGEMGR_NEW_H_
-#define XFA_SRC_FXFA_SRC_PARSER_XFA_LAYOUT_PAGEMGR_NEW_H_
+#ifndef XFA_SRC_FXFA_PARSER_XFA_LAYOUT_PAGEMGR_NEW_H_
+#define XFA_SRC_FXFA_PARSER_XFA_LAYOUT_PAGEMGR_NEW_H_
 
-#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
-#include "xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h"
+#include "xfa/src/fxfa/parser/xfa_doclayout.h"
+#include "xfa/src/fxfa/parser/xfa_layout_itemlayout.h"
 
 class CXFA_ContainerRecord {
  public:
@@ -149,4 +149,4 @@ class CXFA_LayoutPageMgr {
   CFX_ArrayTemplate<CXFA_ContainerLayoutItem*> m_PageArray;
 };
 
-#endif  // XFA_SRC_FXFA_SRC_PARSER_XFA_LAYOUT_PAGEMGR_NEW_H_
+#endif  // XFA_SRC_FXFA_PARSER_XFA_LAYOUT_PAGEMGR_NEW_H_
diff --git a/xfa/src/fxfa/src/parser/xfa_locale.cpp b/xfa/src/fxfa/parser/xfa_locale.cpp
index e3e63d7951..5fc465f872 100644
--- a/xfa/src/fxfa/src/parser/xfa_locale.cpp
+++ b/xfa/src/fxfa/parser/xfa_locale.cpp
@@ -4,18 +4,18 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/parser/xfa_locale.h"
+#include "xfa/src/fxfa/parser/xfa_locale.h"
 
 #include "core/include/fxcrt/fx_xml.h"
-#include "xfa/src/fxfa/src/common/xfa_docdata.h"
-#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
-#include "xfa/src/fxfa/src/common/xfa_document.h"
-#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
-#include "xfa/src/fxfa/src/common/xfa_localemgr.h"
-#include "xfa/src/fxfa/src/common/xfa_object.h"
-#include "xfa/src/fxfa/src/common/xfa_parser.h"
-#include "xfa/src/fxfa/src/common/xfa_script.h"
-#include "xfa/src/fxfa/src/common/xfa_utils.h"
+#include "xfa/src/fxfa/fm2js/xfa_fm2jsapi.h"
+#include "xfa/src/fxfa/parser/xfa_docdata.h"
+#include "xfa/src/fxfa/parser/xfa_doclayout.h"
+#include "xfa/src/fxfa/parser/xfa_document.h"
+#include "xfa/src/fxfa/parser/xfa_localemgr.h"
+#include "xfa/src/fxfa/parser/xfa_object.h"
+#include "xfa/src/fxfa/parser/xfa_parser.h"
+#include "xfa/src/fxfa/parser/xfa_script.h"
+#include "xfa/src/fxfa/parser/xfa_utils.h"
 
 static const FX_WCHAR g_FX_Percent[] = L"z,zzz,zzz,zzz,zzz,zzz%";
 static const FX_WCHAR g_FX_Currency[] = L"$z,zzz,zzz,zzz,zzz,zz9.99";
diff --git a/xfa/src/fxfa/src/parser/xfa_locale.h b/xfa/src/fxfa/parser/xfa_locale.h
index a8391a0c5e..07953f290d 100644
--- a/xfa/src/fxfa/src/parser/xfa_locale.h
+++ b/xfa/src/fxfa/parser/xfa_locale.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_LOCALE_H_
-#define XFA_SRC_FXFA_SRC_PARSER_XFA_LOCALE_H_
+#ifndef XFA_SRC_FXFA_PARSER_XFA_LOCALE_H_
+#define XFA_SRC_FXFA_PARSER_XFA_LOCALE_H_
 
 #include "xfa/src/fgas/include/fx_locale.h"
-#include "xfa/src/fxfa/src/common/xfa_object.h"
+#include "xfa/src/fxfa/parser/xfa_object.h"
 
 class CXFA_XMLLocale : public IFX_Locale {
  public:
@@ -90,4 +90,4 @@ class CXFA_NodeLocale : public IFX_Locale {
   CXFA_Node* m_pLocale;
 };
 
-#endif  // XFA_SRC_FXFA_SRC_PARSER_XFA_LOCALE_H_
+#endif  // XFA_SRC_FXFA_PARSER_XFA_LOCALE_H_
diff --git a/xfa/src/fxfa/src/parser/xfa_localemgr.cpp b/xfa/src/fxfa/parser/xfa_localemgr.cpp
index 8d0c8d27f4..bb27c9c1e2 100644
--- a/xfa/src/fxfa/src/parser/xfa_localemgr.cpp
+++ b/xfa/src/fxfa/parser/xfa_localemgr.cpp
@@ -4,20 +4,20 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/common/xfa_localemgr.h"
+#include "xfa/src/fxfa/parser/xfa_localemgr.h"
 
 #include "core/include/fxcodec/fx_codec.h"
 #include "core/include/fxcrt/fx_xml.h"
 #include "core/include/fxge/fx_ge.h"
-#include "xfa/src/fxfa/src/common/xfa_docdata.h"
-#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
-#include "xfa/src/fxfa/src/common/xfa_document.h"
-#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
-#include "xfa/src/fxfa/src/common/xfa_object.h"
-#include "xfa/src/fxfa/src/common/xfa_parser.h"
-#include "xfa/src/fxfa/src/common/xfa_script.h"
-#include "xfa/src/fxfa/src/common/xfa_utils.h"
-#include "xfa/src/fxfa/src/parser/xfa_locale.h"
+#include "xfa/src/fxfa/fm2js/xfa_fm2jsapi.h"
+#include "xfa/src/fxfa/parser/xfa_docdata.h"
+#include "xfa/src/fxfa/parser/xfa_doclayout.h"
+#include "xfa/src/fxfa/parser/xfa_document.h"
+#include "xfa/src/fxfa/parser/xfa_locale.h"
+#include "xfa/src/fxfa/parser/xfa_object.h"
+#include "xfa/src/fxfa/parser/xfa_parser.h"
+#include "xfa/src/fxfa/parser/xfa_script.h"
+#include "xfa/src/fxfa/parser/xfa_utils.h"
 
 const uint8_t g_enUS_Locale[] = {
     0x78, 0x9C, 0x95, 0x56, 0xD1, 0x6E, 0x9B, 0x30, 0x14, 0x7D, 0x9F, 0xB4,
diff --git a/xfa/src/fxfa/src/common/xfa_localemgr.h b/xfa/src/fxfa/parser/xfa_localemgr.h
index 04ca87791f..c76674c969 100644
--- a/xfa/src/fxfa/src/common/xfa_localemgr.h
+++ b/xfa/src/fxfa/parser/xfa_localemgr.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_LOCALEMGR_H_
-#define XFA_SRC_FXFA_SRC_COMMON_XFA_LOCALEMGR_H_
+#ifndef XFA_SRC_FXFA_PARSER_XFA_LOCALEMGR_H_
+#define XFA_SRC_FXFA_PARSER_XFA_LOCALEMGR_H_
 
 #include "xfa/include/fxfa/fxfa_objectacc.h"
 #include "xfa/src/fgas/include/fx_datetime.h"
 #include "xfa/src/fgas/include/fx_locale.h"
-#include "xfa/src/fxfa/src/common/xfa_localemgr.h"
+#include "xfa/src/fxfa/parser/xfa_localemgr.h"
 
 class CXFA_Node;
 class IFX_Locale;
@@ -75,4 +75,4 @@ class CXFA_TimeZoneProvider : public IXFA_TimeZoneProvider {
   FX_TIMEZONE m_tz;
 };
 
-#endif  // XFA_SRC_FXFA_SRC_COMMON_XFA_LOCALEMGR_H_
+#endif  // XFA_SRC_FXFA_PARSER_XFA_LOCALEMGR_H_
diff --git a/xfa/src/fxfa/src/parser/xfa_localevalue.cpp b/xfa/src/fxfa/parser/xfa_localevalue.cpp
index ba00c2e639..5b9dc27681 100644
--- a/xfa/src/fxfa/src/parser/xfa_localevalue.cpp
+++ b/xfa/src/fxfa/parser/xfa_localevalue.cpp
@@ -4,17 +4,17 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/common/fxfa_localevalue.h"
+#include "xfa/src/fxfa/parser/xfa_localevalue.h"
 
-#include "xfa/src/fxfa/src/common/xfa_docdata.h"
-#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
-#include "xfa/src/fxfa/src/common/xfa_document.h"
-#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
-#include "xfa/src/fxfa/src/common/xfa_localemgr.h"
-#include "xfa/src/fxfa/src/common/xfa_object.h"
-#include "xfa/src/fxfa/src/common/xfa_parser.h"
-#include "xfa/src/fxfa/src/common/xfa_script.h"
-#include "xfa/src/fxfa/src/common/xfa_utils.h"
+#include "xfa/src/fxfa/fm2js/xfa_fm2jsapi.h"
+#include "xfa/src/fxfa/parser/xfa_docdata.h"
+#include "xfa/src/fxfa/parser/xfa_doclayout.h"
+#include "xfa/src/fxfa/parser/xfa_document.h"
+#include "xfa/src/fxfa/parser/xfa_localemgr.h"
+#include "xfa/src/fxfa/parser/xfa_object.h"
+#include "xfa/src/fxfa/parser/xfa_parser.h"
+#include "xfa/src/fxfa/parser/xfa_script.h"
+#include "xfa/src/fxfa/parser/xfa_utils.h"
 
 static const FX_DOUBLE fraction_scales[] = {0.1,
                                             0.01,
diff --git a/xfa/src/fxfa/src/common/fxfa_localevalue.h b/xfa/src/fxfa/parser/xfa_localevalue.h
index 0ac76c8aed..bcdf037fcd 100644
--- a/xfa/src/fxfa/src/common/fxfa_localevalue.h
+++ b/xfa/src/fxfa/parser/xfa_localevalue.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_COMMON_FXFA_LOCALEVALUE_H_
-#define XFA_SRC_FXFA_SRC_COMMON_FXFA_LOCALEVALUE_H_
+#ifndef XFA_SRC_FXFA_PARSER_XFA_LOCALEVALUE_H_
+#define XFA_SRC_FXFA_PARSER_XFA_LOCALEVALUE_H_
 
 #include "xfa/include/fxfa/fxfa_objectacc.h"
 
@@ -109,4 +109,4 @@ class CXFA_LocaleValue {
   FX_BOOL m_bValid;
 };
 
-#endif  // XFA_SRC_FXFA_SRC_COMMON_FXFA_LOCALEVALUE_H_
+#endif  // XFA_SRC_FXFA_PARSER_XFA_LOCALEVALUE_H_
diff --git a/xfa/src/fxfa/src/common/xfa_object.h b/xfa/src/fxfa/parser/xfa_object.h
index 7819c5f6ba..745108a81b 100644
--- a/xfa/src/fxfa/src/common/xfa_object.h
+++ b/xfa/src/fxfa/parser/xfa_object.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_OBJECT_H_
-#define XFA_SRC_FXFA_SRC_COMMON_XFA_OBJECT_H_
+#ifndef XFA_SRC_FXFA_PARSER_XFA_OBJECT_H_
+#define XFA_SRC_FXFA_PARSER_XFA_OBJECT_H_
 
 #include "xfa/src/fdp/include/fde_xml.h"
-#include "xfa/src/fxfa/src/common/xfa_utils.h"
+#include "xfa/src/fxfa/parser/xfa_utils.h"
 
 class CXFA_Document;
 class CXFA_Node;
@@ -800,4 +800,4 @@ inline const CXFA_NodeList* ToNodeList(const CXFA_Object* pObj) {
   return pObj ? pObj->AsNodeList() : nullptr;
 }
 
-#endif  // XFA_SRC_FXFA_SRC_COMMON_XFA_OBJECT_H_
+#endif  // XFA_SRC_FXFA_PARSER_XFA_OBJECT_H_
diff --git a/xfa/src/fxfa/src/parser/xfa_object_imp.cpp b/xfa/src/fxfa/parser/xfa_object_imp.cpp
index c7a288bb27..f2cea35ff4 100644
--- a/xfa/src/fxfa/src/parser/xfa_object_imp.cpp
+++ b/xfa/src/fxfa/parser/xfa_object_imp.cpp
@@ -4,20 +4,21 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "xfa/src/fxfa/parser/xfa_object.h"
+
 #include "core/include/fxcrt/fx_ext.h"
 #include "xfa/src/fgas/include/fx_cpg.h"
 #include "xfa/src/fgas/include/fx_sys.h"
-#include "xfa/src/fxfa/src/common/xfa_docdata.h"
-#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
-#include "xfa/src/fxfa/src/common/xfa_document.h"
-#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
-#include "xfa/src/fxfa/src/common/xfa_localemgr.h"
-#include "xfa/src/fxfa/src/common/xfa_object.h"
-#include "xfa/src/fxfa/src/common/xfa_parser.h"
-#include "xfa/src/fxfa/src/common/xfa_script.h"
-#include "xfa/src/fxfa/src/common/xfa_utils.h"
-#include "xfa/src/fxfa/src/parser/xfa_basic_imp.h"
-#include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h"
+#include "xfa/src/fxfa/fm2js/xfa_fm2jsapi.h"
+#include "xfa/src/fxfa/parser/xfa_basic_imp.h"
+#include "xfa/src/fxfa/parser/xfa_docdata.h"
+#include "xfa/src/fxfa/parser/xfa_doclayout.h"
+#include "xfa/src/fxfa/parser/xfa_document.h"
+#include "xfa/src/fxfa/parser/xfa_document_layout_imp.h"
+#include "xfa/src/fxfa/parser/xfa_localemgr.h"
+#include "xfa/src/fxfa/parser/xfa_parser.h"
+#include "xfa/src/fxfa/parser/xfa_script.h"
+#include "xfa/src/fxfa/parser/xfa_utils.h"
 
 CXFA_Object::CXFA_Object(CXFA_Document* pDocument, FX_DWORD uFlags)
     : m_pDocument(pDocument), m_uFlags(uFlags) {}
@@ -698,8 +699,7 @@ void CXFA_Node::Script_Som_ResolveNodeList(FXJSE_HVALUE hValue,
   if (refNode == NULL) {
     refNode = this;
   }
-  pScriptContext->ResolveObjects(refNode, wsExpression,
-                                 resoveNodeRS, dwFlag);
+  pScriptContext->ResolveObjects(refNode, wsExpression, resoveNodeRS, dwFlag);
   CXFA_ArrayNodeList* pNodeList = new CXFA_ArrayNodeList(m_pDocument);
   if (resoveNodeRS.dwFlags == XFA_RESOVENODE_RSTYPE_Nodes) {
     for (int32_t i = 0; i < resoveNodeRS.nodes.GetSize(); i++) {
diff --git a/xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp b/xfa/src/fxfa/parser/xfa_objectacc_imp.cpp
index acbb521446..9515237683 100644
--- a/xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp
+++ b/xfa/src/fxfa/parser/xfa_objectacc_imp.cpp
@@ -6,16 +6,16 @@
 
 #include "core/include/fxcrt/fx_ext.h"
 #include "xfa/include/fxbarcode/BC_BarCode.h"
-#include "xfa/src/fxfa/src/common/fxfa_localevalue.h"
-#include "xfa/src/fxfa/src/common/xfa_docdata.h"
-#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
-#include "xfa/src/fxfa/src/common/xfa_document.h"
-#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
-#include "xfa/src/fxfa/src/common/xfa_localemgr.h"
-#include "xfa/src/fxfa/src/common/xfa_object.h"
-#include "xfa/src/fxfa/src/common/xfa_parser.h"
-#include "xfa/src/fxfa/src/common/xfa_script.h"
-#include "xfa/src/fxfa/src/common/xfa_utils.h"
+#include "xfa/src/fxfa/fm2js/xfa_fm2jsapi.h"
+#include "xfa/src/fxfa/parser/xfa_docdata.h"
+#include "xfa/src/fxfa/parser/xfa_doclayout.h"
+#include "xfa/src/fxfa/parser/xfa_document.h"
+#include "xfa/src/fxfa/parser/xfa_localemgr.h"
+#include "xfa/src/fxfa/parser/xfa_localevalue.h"
+#include "xfa/src/fxfa/parser/xfa_object.h"
+#include "xfa/src/fxfa/parser/xfa_parser.h"
+#include "xfa/src/fxfa/parser/xfa_script.h"
+#include "xfa/src/fxfa/parser/xfa_utils.h"
 
 static FX_ARGB XFA_WStringToColor(const CFX_WideStringC& wsValue) {
   uint8_t r = 0, g = 0, b = 0;
diff --git a/xfa/src/fxfa/src/common/xfa_parser.h b/xfa/src/fxfa/parser/xfa_parser.h
index 43fdb639cb..814228177c 100644
--- a/xfa/src/fxfa/src/common/xfa_parser.h
+++ b/xfa/src/fxfa/parser/xfa_parser.h
@@ -4,11 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_PARSER_H_
-#define XFA_SRC_FXFA_SRC_COMMON_XFA_PARSER_H_
-
-#include "xfa/src/fxfa/src/common/xfa_document.h"
+#ifndef XFA_SRC_FXFA_PARSER_XFA_PARSER_H_
+#define XFA_SRC_FXFA_PARSER_XFA_PARSER_H_
 
+#include "xfa/src/fxfa/parser/xfa_document.h"
 
 class IXFA_Parser {
  public:
@@ -36,4 +35,4 @@ class IXFA_DocParser : public IXFA_Parser {
   virtual IXFA_Notify* GetNotify() const = 0;
 };
 
-#endif  // XFA_SRC_FXFA_SRC_COMMON_XFA_PARSER_H_
+#endif  // XFA_SRC_FXFA_PARSER_XFA_PARSER_H_
diff --git a/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp b/xfa/src/fxfa/parser/xfa_parser_imp.cpp
index 6709c62318..fe90f004b2 100644
--- a/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp
+++ b/xfa/src/fxfa/parser/xfa_parser_imp.cpp
@@ -4,19 +4,19 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/parser/xfa_parser_imp.h"
+#include "xfa/src/fxfa/parser/xfa_parser_imp.h"
 
 #include "xfa/src/fgas/include/fx_cpg.h"
-#include "xfa/src/fxfa/src/common/xfa_docdata.h"
-#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
-#include "xfa/src/fxfa/src/common/xfa_document.h"
-#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
-#include "xfa/src/fxfa/src/common/xfa_localemgr.h"
-#include "xfa/src/fxfa/src/common/xfa_object.h"
-#include "xfa/src/fxfa/src/common/xfa_parser.h"
-#include "xfa/src/fxfa/src/common/xfa_script.h"
-#include "xfa/src/fxfa/src/common/xfa_utils.h"
-#include "xfa/src/fxfa/src/parser/xfa_basic_imp.h"
+#include "xfa/src/fxfa/fm2js/xfa_fm2jsapi.h"
+#include "xfa/src/fxfa/parser/xfa_basic_imp.h"
+#include "xfa/src/fxfa/parser/xfa_docdata.h"
+#include "xfa/src/fxfa/parser/xfa_doclayout.h"
+#include "xfa/src/fxfa/parser/xfa_document.h"
+#include "xfa/src/fxfa/parser/xfa_localemgr.h"
+#include "xfa/src/fxfa/parser/xfa_object.h"
+#include "xfa/src/fxfa/parser/xfa_parser.h"
+#include "xfa/src/fxfa/parser/xfa_script.h"
+#include "xfa/src/fxfa/parser/xfa_utils.h"
 
 IXFA_Parser* IXFA_Parser::Create(IXFA_ObjFactory* pFactory,
                                  FX_BOOL bDocumentParser) {
@@ -31,8 +31,7 @@ CXFA_SimpleParser::CXFA_SimpleParser(IXFA_ObjFactory* pFactory,
       m_pFactory(pFactory),
       m_pRootNode(nullptr),
       m_ePacketID(XFA_XDPPACKET_UNKNOWN),
-      m_bDocumentParser(bDocumentParser) {
-}
+      m_bDocumentParser(bDocumentParser) {}
 CXFA_SimpleParser::~CXFA_SimpleParser() {
   CloseParser();
 }
@@ -1350,8 +1349,7 @@ IXFA_DocParser* IXFA_DocParser::Create(IXFA_Notify* pNotify) {
   return new CXFA_DocumentParser(pNotify);
 }
 CXFA_DocumentParser::CXFA_DocumentParser(IXFA_Notify* pNotify)
-    : m_nodeParser(NULL, TRUE), m_pNotify(pNotify), m_pDocument(NULL) {
-}
+    : m_nodeParser(NULL, TRUE), m_pNotify(pNotify), m_pDocument(NULL) {}
 CXFA_DocumentParser::~CXFA_DocumentParser() {
   CloseParser();
 }
@@ -1403,8 +1401,7 @@ void CXFA_DocumentParser::CloseParser() {
   m_nodeParser.CloseParser();
 }
 CXFA_XMLParser::CXFA_XMLParser(IFDE_XMLNode* pRoot, IFX_Stream* pStream)
-    :
-      m_nElementStart(0),
+    : m_nElementStart(0),
       m_dwCheckStatus(0),
       m_dwCurrentCheckStatus(0),
       m_pRoot(pRoot),
diff --git a/xfa/src/fxfa/src/parser/xfa_parser_imp.h b/xfa/src/fxfa/parser/xfa_parser_imp.h
index f2a936907f..f288bc0930 100644
--- a/xfa/src/fxfa/src/parser/xfa_parser_imp.h
+++ b/xfa/src/fxfa/parser/xfa_parser_imp.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_PARSER_IMP_H_
-#define XFA_SRC_FXFA_SRC_PARSER_XFA_PARSER_IMP_H_
+#ifndef XFA_SRC_FXFA_PARSER_XFA_PARSER_IMP_H_
+#define XFA_SRC_FXFA_PARSER_XFA_PARSER_IMP_H_
 
-#include "xfa/src/fxfa/src/common/xfa_parser.h"
+#include "xfa/src/fxfa/parser/xfa_parser.h"
 
 class CXFA_XMLParser;
 
@@ -135,4 +135,4 @@ class CXFA_XMLParser : public IFDE_XMLParser {
   FX_DWORD m_dwStatus;
 };
 
-#endif  // XFA_SRC_FXFA_SRC_PARSER_XFA_PARSER_IMP_H_
+#endif  // XFA_SRC_FXFA_PARSER_XFA_PARSER_IMP_H_
diff --git a/xfa/src/fxfa/src/parser/xfa_parser_imp_embeddertest.cpp b/xfa/src/fxfa/parser/xfa_parser_imp_embeddertest.cpp
index 63fe272872..63fe272872 100644
--- a/xfa/src/fxfa/src/parser/xfa_parser_imp_embeddertest.cpp
+++ b/xfa/src/fxfa/parser/xfa_parser_imp_embeddertest.cpp
diff --git a/xfa/src/fxfa/src/common/xfa_script.h b/xfa/src/fxfa/parser/xfa_script.h
index 47be3165fe..286e8f704e 100644
--- a/xfa/src/fxfa/src/common/xfa_script.h
+++ b/xfa/src/fxfa/parser/xfa_script.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_SCRIPT_H_
-#define XFA_SRC_FXFA_SRC_COMMON_XFA_SCRIPT_H_
+#ifndef XFA_SRC_FXFA_PARSER_XFA_SCRIPT_H_
+#define XFA_SRC_FXFA_PARSER_XFA_SCRIPT_H_
 
 #include "xfa/include/fxfa/fxfa.h"
 #include "xfa/include/fxfa/fxfa_objectacc.h"
@@ -118,4 +118,4 @@ class IXFA_ScriptContext {
 };
 IXFA_ScriptContext* XFA_ScriptContext_Create(CXFA_Document* pDocument);
 
-#endif  // XFA_SRC_FXFA_SRC_COMMON_XFA_SCRIPT_H_
+#endif  // XFA_SRC_FXFA_PARSER_XFA_SCRIPT_H_
diff --git a/xfa/src/fxfa/src/parser/xfa_script_datawindow.cpp b/xfa/src/fxfa/parser/xfa_script_datawindow.cpp
index fa7d2560c6..33146adcd0 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_datawindow.cpp
+++ b/xfa/src/fxfa/parser/xfa_script_datawindow.cpp
@@ -4,17 +4,17 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/parser/xfa_script_datawindow.h"
+#include "xfa/src/fxfa/parser/xfa_script_datawindow.h"
 
-#include "xfa/src/fxfa/src/common/xfa_docdata.h"
-#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
-#include "xfa/src/fxfa/src/common/xfa_document.h"
-#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
-#include "xfa/src/fxfa/src/common/xfa_localemgr.h"
-#include "xfa/src/fxfa/src/common/xfa_object.h"
-#include "xfa/src/fxfa/src/common/xfa_parser.h"
-#include "xfa/src/fxfa/src/common/xfa_script.h"
-#include "xfa/src/fxfa/src/common/xfa_utils.h"
+#include "xfa/src/fxfa/fm2js/xfa_fm2jsapi.h"
+#include "xfa/src/fxfa/parser/xfa_docdata.h"
+#include "xfa/src/fxfa/parser/xfa_doclayout.h"
+#include "xfa/src/fxfa/parser/xfa_document.h"
+#include "xfa/src/fxfa/parser/xfa_localemgr.h"
+#include "xfa/src/fxfa/parser/xfa_object.h"
+#include "xfa/src/fxfa/parser/xfa_parser.h"
+#include "xfa/src/fxfa/parser/xfa_script.h"
+#include "xfa/src/fxfa/parser/xfa_utils.h"
 
 CScript_DataWindow::CScript_DataWindow(CXFA_Document* pDocument)
     : CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_DataWindow) {
diff --git a/xfa/src/fxfa/src/parser/xfa_script_datawindow.h b/xfa/src/fxfa/parser/xfa_script_datawindow.h
index 8274d05d25..2639d3c5d3 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_datawindow.h
+++ b/xfa/src/fxfa/parser/xfa_script_datawindow.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_DATAWINDOW_H_
-#define XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_DATAWINDOW_H_
+#ifndef XFA_SRC_FXFA_PARSER_XFA_SCRIPT_DATAWINDOW_H_
+#define XFA_SRC_FXFA_PARSER_XFA_SCRIPT_DATAWINDOW_H_
 
-#include "xfa/src/fxfa/src/common/xfa_object.h"
+#include "xfa/src/fxfa/parser/xfa_object.h"
 
 class CScript_DataWindow : public CXFA_OrdinaryObject {
  public:
@@ -31,4 +31,4 @@ class CScript_DataWindow : public CXFA_OrdinaryObject {
                                    XFA_ATTRIBUTE eAttribute);
 };
 
-#endif  // XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_DATAWINDOW_H_
+#endif  // XFA_SRC_FXFA_PARSER_XFA_SCRIPT_DATAWINDOW_H_
diff --git a/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.cpp b/xfa/src/fxfa/parser/xfa_script_eventpseudomodel.cpp
index 26ae836fc8..8c8cd5214e 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.cpp
+++ b/xfa/src/fxfa/parser/xfa_script_eventpseudomodel.cpp
@@ -4,17 +4,17 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.h"
+#include "xfa/src/fxfa/parser/xfa_script_eventpseudomodel.h"
 
-#include "xfa/src/fxfa/src/common/xfa_docdata.h"
-#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
-#include "xfa/src/fxfa/src/common/xfa_document.h"
-#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
-#include "xfa/src/fxfa/src/common/xfa_localemgr.h"
-#include "xfa/src/fxfa/src/common/xfa_object.h"
-#include "xfa/src/fxfa/src/common/xfa_parser.h"
-#include "xfa/src/fxfa/src/common/xfa_script.h"
-#include "xfa/src/fxfa/src/common/xfa_utils.h"
+#include "xfa/src/fxfa/fm2js/xfa_fm2jsapi.h"
+#include "xfa/src/fxfa/parser/xfa_docdata.h"
+#include "xfa/src/fxfa/parser/xfa_doclayout.h"
+#include "xfa/src/fxfa/parser/xfa_document.h"
+#include "xfa/src/fxfa/parser/xfa_localemgr.h"
+#include "xfa/src/fxfa/parser/xfa_object.h"
+#include "xfa/src/fxfa/parser/xfa_parser.h"
+#include "xfa/src/fxfa/parser/xfa_script.h"
+#include "xfa/src/fxfa/parser/xfa_utils.h"
 
 CScript_EventPseudoModel::CScript_EventPseudoModel(CXFA_Document* pDocument)
     : CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_EventPseudoModel) {
diff --git a/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.h b/xfa/src/fxfa/parser/xfa_script_eventpseudomodel.h
index b6bfeab574..770ec2e4b9 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.h
+++ b/xfa/src/fxfa/parser/xfa_script_eventpseudomodel.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_EVENTPSEUDOMODEL_H_
-#define XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_EVENTPSEUDOMODEL_H_
+#ifndef XFA_SRC_FXFA_PARSER_XFA_SCRIPT_EVENTPSEUDOMODEL_H_
+#define XFA_SRC_FXFA_PARSER_XFA_SCRIPT_EVENTPSEUDOMODEL_H_
 
-#include "xfa/src/fxfa/src/common/xfa_object.h"
+#include "xfa/src/fxfa/parser/xfa_object.h"
 
 #define XFA_EVENT_CHANGE 0
 #define XFA_EVENT_COMMITKEY 1
@@ -93,4 +93,4 @@ class CScript_EventPseudoModel : public CXFA_OrdinaryObject {
                                         FX_BOOL bSetting);
 };
 
-#endif  // XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_EVENTPSEUDOMODEL_H_
+#endif  // XFA_SRC_FXFA_PARSER_XFA_SCRIPT_EVENTPSEUDOMODEL_H_
diff --git a/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.cpp b/xfa/src/fxfa/parser/xfa_script_hostpseudomodel.cpp
index 69d6c41ab3..4e5be8f3c4 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.cpp
+++ b/xfa/src/fxfa/parser/xfa_script_hostpseudomodel.cpp
@@ -4,17 +4,17 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.h"
+#include "xfa/src/fxfa/parser/xfa_script_hostpseudomodel.h"
 
-#include "xfa/src/fxfa/src/common/xfa_docdata.h"
-#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
-#include "xfa/src/fxfa/src/common/xfa_document.h"
-#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
-#include "xfa/src/fxfa/src/common/xfa_localemgr.h"
-#include "xfa/src/fxfa/src/common/xfa_object.h"
-#include "xfa/src/fxfa/src/common/xfa_parser.h"
-#include "xfa/src/fxfa/src/common/xfa_script.h"
-#include "xfa/src/fxfa/src/common/xfa_utils.h"
+#include "xfa/src/fxfa/fm2js/xfa_fm2jsapi.h"
+#include "xfa/src/fxfa/parser/xfa_docdata.h"
+#include "xfa/src/fxfa/parser/xfa_doclayout.h"
+#include "xfa/src/fxfa/parser/xfa_document.h"
+#include "xfa/src/fxfa/parser/xfa_localemgr.h"
+#include "xfa/src/fxfa/parser/xfa_object.h"
+#include "xfa/src/fxfa/parser/xfa_parser.h"
+#include "xfa/src/fxfa/parser/xfa_script.h"
+#include "xfa/src/fxfa/parser/xfa_utils.h"
 
 CScript_HostPseudoModel::CScript_HostPseudoModel(CXFA_Document* pDocument)
     : CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_HostPseudoModel) {
diff --git a/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.h b/xfa/src/fxfa/parser/xfa_script_hostpseudomodel.h
index 0b9e80e149..7154a255f6 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.h
+++ b/xfa/src/fxfa/parser/xfa_script_hostpseudomodel.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_HOSTPSEUDOMODEL_H_
-#define XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_HOSTPSEUDOMODEL_H_
+#ifndef XFA_SRC_FXFA_PARSER_XFA_SCRIPT_HOSTPSEUDOMODEL_H_
+#define XFA_SRC_FXFA_PARSER_XFA_SCRIPT_HOSTPSEUDOMODEL_H_
 
-#include "xfa/src/fxfa/src/common/xfa_document.h"
-#include "xfa/src/fxfa/src/common/xfa_object.h"
+#include "xfa/src/fxfa/parser/xfa_document.h"
+#include "xfa/src/fxfa/parser/xfa_object.h"
 
 class CScript_HostPseudoModel : public CXFA_OrdinaryObject {
  public:
@@ -86,4 +86,4 @@ class CScript_HostPseudoModel : public CXFA_OrdinaryObject {
       CFX_WideString& wsValue);
 };
 
-#endif  // XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_HOSTPSEUDOMODEL_H_
+#endif  // XFA_SRC_FXFA_PARSER_XFA_SCRIPT_HOSTPSEUDOMODEL_H_
diff --git a/xfa/src/fxfa/src/parser/xfa_script_imp.cpp b/xfa/src/fxfa/parser/xfa_script_imp.cpp
index 2b99e24306..3682580eb5 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_imp.cpp
+++ b/xfa/src/fxfa/parser/xfa_script_imp.cpp
@@ -4,20 +4,20 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/parser/xfa_script_imp.h"
+#include "xfa/src/fxfa/parser/xfa_script_imp.h"
 
 #include "core/include/fxcrt/fx_ext.h"
-#include "xfa/src/fxfa/src/common/xfa_docdata.h"
-#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
-#include "xfa/src/fxfa/src/common/xfa_document.h"
-#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
-#include "xfa/src/fxfa/src/common/xfa_localemgr.h"
-#include "xfa/src/fxfa/src/common/xfa_object.h"
-#include "xfa/src/fxfa/src/common/xfa_parser.h"
-#include "xfa/src/fxfa/src/common/xfa_script.h"
-#include "xfa/src/fxfa/src/common/xfa_utils.h"
-#include "xfa/src/fxfa/src/parser/xfa_script_nodehelper.h"
-#include "xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h"
+#include "xfa/src/fxfa/fm2js/xfa_fm2jsapi.h"
+#include "xfa/src/fxfa/parser/xfa_docdata.h"
+#include "xfa/src/fxfa/parser/xfa_doclayout.h"
+#include "xfa/src/fxfa/parser/xfa_document.h"
+#include "xfa/src/fxfa/parser/xfa_script_nodehelper.h"
+#include "xfa/src/fxfa/parser/xfa_script_resolveprocessor.h"
+#include "xfa/src/fxfa/parser/xfa_localemgr.h"
+#include "xfa/src/fxfa/parser/xfa_object.h"
+#include "xfa/src/fxfa/parser/xfa_parser.h"
+#include "xfa/src/fxfa/parser/xfa_script.h"
+#include "xfa/src/fxfa/parser/xfa_utils.h"
 
 CXFA_ScriptContext::CXFA_ScriptContext(CXFA_Document* pDocument)
     : m_pDocument(pDocument),
diff --git a/xfa/src/fxfa/src/parser/xfa_script_imp.h b/xfa/src/fxfa/parser/xfa_script_imp.h
index 15dc09d726..529ab6d087 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_imp.h
+++ b/xfa/src/fxfa/parser/xfa_script_imp.h
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_IMP_H_
-#define XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_IMP_H_
+#ifndef XFA_SRC_FXFA_PARSER_XFA_SCRIPT_IMP_H_
+#define XFA_SRC_FXFA_PARSER_XFA_SCRIPT_IMP_H_
 
 #include <map>
 
-#include "xfa/src/fxfa/src/common/xfa_document.h"
-#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
-#include "xfa/src/fxfa/src/common/xfa_script.h"
+#include "xfa/src/fxfa/fm2js/xfa_fm2jsapi.h"
+#include "xfa/src/fxfa/parser/xfa_document.h"
+#include "xfa/src/fxfa/parser/xfa_script.h"
 
 #define XFA_RESOLVENODE_TagName 0x0002
 
@@ -124,4 +124,4 @@ class CXFA_ScriptContext : public IXFA_ScriptContext {
   XFA_ATTRIBUTEENUM m_eRunAtType;
 };
 
-#endif  //  XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_IMP_H_
+#endif  //  XFA_SRC_FXFA_PARSER_XFA_SCRIPT_IMP_H_
diff --git a/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp b/xfa/src/fxfa/parser/xfa_script_layoutpseudomodel.cpp
index 6f032d2c45..fe8990ac1a 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp
+++ b/xfa/src/fxfa/parser/xfa_script_layoutpseudomodel.cpp
@@ -4,19 +4,19 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.h"
+#include "xfa/src/fxfa/parser/xfa_script_layoutpseudomodel.h"
 
-#include "xfa/src/fxfa/src/common/xfa_docdata.h"
-#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
-#include "xfa/src/fxfa/src/common/xfa_document.h"
-#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
-#include "xfa/src/fxfa/src/common/xfa_localemgr.h"
-#include "xfa/src/fxfa/src/common/xfa_object.h"
-#include "xfa/src/fxfa/src/common/xfa_parser.h"
-#include "xfa/src/fxfa/src/common/xfa_script.h"
-#include "xfa/src/fxfa/src/common/xfa_utils.h"
-#include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h"
-#include "xfa/src/fxfa/src/parser/xfa_layout_appadapter.h"
+#include "xfa/src/fxfa/fm2js/xfa_fm2jsapi.h"
+#include "xfa/src/fxfa/parser/xfa_docdata.h"
+#include "xfa/src/fxfa/parser/xfa_doclayout.h"
+#include "xfa/src/fxfa/parser/xfa_document.h"
+#include "xfa/src/fxfa/parser/xfa_document_layout_imp.h"
+#include "xfa/src/fxfa/parser/xfa_layout_appadapter.h"
+#include "xfa/src/fxfa/parser/xfa_localemgr.h"
+#include "xfa/src/fxfa/parser/xfa_object.h"
+#include "xfa/src/fxfa/parser/xfa_parser.h"
+#include "xfa/src/fxfa/parser/xfa_script.h"
+#include "xfa/src/fxfa/parser/xfa_utils.h"
 
 CScript_LayoutPseudoModel::CScript_LayoutPseudoModel(CXFA_Document* pDocument)
     : CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_LayoutPseudoModel) {
diff --git a/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.h b/xfa/src/fxfa/parser/xfa_script_layoutpseudomodel.h
index ff43bd7bd8..5b0dbb816f 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.h
+++ b/xfa/src/fxfa/parser/xfa_script_layoutpseudomodel.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_LAYOUTPSEUDOMODEL_H_
-#define XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_LAYOUTPSEUDOMODEL_H_
+#ifndef XFA_SRC_FXFA_PARSER_XFA_SCRIPT_LAYOUTPSEUDOMODEL_H_
+#define XFA_SRC_FXFA_PARSER_XFA_SCRIPT_LAYOUTPSEUDOMODEL_H_
 
-#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
-#include "xfa/src/fxfa/src/common/xfa_object.h"
+#include "xfa/src/fxfa/parser/xfa_doclayout.h"
+#include "xfa/src/fxfa/parser/xfa_object.h"
 
 enum XFA_LAYOUTMODEL_HWXY {
   XFA_LAYOUTMODEL_H,
@@ -61,4 +61,4 @@ class CScript_LayoutPseudoModel : public CXFA_OrdinaryObject {
                                         FX_BOOL bAbsPage);
 };
 
-#endif  // XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_LAYOUTPSEUDOMODEL_H_
+#endif  // XFA_SRC_FXFA_PARSER_XFA_SCRIPT_LAYOUTPSEUDOMODEL_H_
diff --git a/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.cpp b/xfa/src/fxfa/parser/xfa_script_logpseudomodel.cpp
index dd51a62d44..d5ddd811ad 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.cpp
+++ b/xfa/src/fxfa/parser/xfa_script_logpseudomodel.cpp
@@ -4,17 +4,17 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.h"
+#include "xfa/src/fxfa/parser/xfa_script_logpseudomodel.h"
 
-#include "xfa/src/fxfa/src/common/xfa_docdata.h"
-#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
-#include "xfa/src/fxfa/src/common/xfa_document.h"
-#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
-#include "xfa/src/fxfa/src/common/xfa_localemgr.h"
-#include "xfa/src/fxfa/src/common/xfa_object.h"
-#include "xfa/src/fxfa/src/common/xfa_parser.h"
-#include "xfa/src/fxfa/src/common/xfa_script.h"
-#include "xfa/src/fxfa/src/common/xfa_utils.h"
+#include "xfa/src/fxfa/fm2js/xfa_fm2jsapi.h"
+#include "xfa/src/fxfa/parser/xfa_docdata.h"
+#include "xfa/src/fxfa/parser/xfa_doclayout.h"
+#include "xfa/src/fxfa/parser/xfa_document.h"
+#include "xfa/src/fxfa/parser/xfa_localemgr.h"
+#include "xfa/src/fxfa/parser/xfa_object.h"
+#include "xfa/src/fxfa/parser/xfa_parser.h"
+#include "xfa/src/fxfa/parser/xfa_script.h"
+#include "xfa/src/fxfa/parser/xfa_utils.h"
 
 CScript_LogPseudoModel::CScript_LogPseudoModel(CXFA_Document* pDocument)
     : CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_LogPseudoModel) {
diff --git a/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.h b/xfa/src/fxfa/parser/xfa_script_logpseudomodel.h
index 65bfbb112f..ee3d35c052 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.h
+++ b/xfa/src/fxfa/parser/xfa_script_logpseudomodel.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_LOGPSEUDOMODEL_H_
-#define XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_LOGPSEUDOMODEL_H_
+#ifndef XFA_SRC_FXFA_PARSER_XFA_SCRIPT_LOGPSEUDOMODEL_H_
+#define XFA_SRC_FXFA_PARSER_XFA_SCRIPT_LOGPSEUDOMODEL_H_
 
-#include "xfa/src/fxfa/src/common/xfa_object.h"
+#include "xfa/src/fxfa/parser/xfa_object.h"
 
 class CScript_LogPseudoModel : public CXFA_OrdinaryObject {
  public:
@@ -21,4 +21,4 @@ class CScript_LogPseudoModel : public CXFA_OrdinaryObject {
   void Script_LogPseudoModel_Trace(CFXJSE_Arguments* pArguments);
 };
 
-#endif  // XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_LOGPSEUDOMODEL_H_
+#endif  // XFA_SRC_FXFA_PARSER_XFA_SCRIPT_LOGPSEUDOMODEL_H_
diff --git a/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp b/xfa/src/fxfa/parser/xfa_script_nodehelper.cpp
index 9176bcc34e..e2f047591e 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp
+++ b/xfa/src/fxfa/parser/xfa_script_nodehelper.cpp
@@ -4,19 +4,19 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/parser/xfa_script_nodehelper.h"
+#include "xfa/src/fxfa/parser/xfa_script_nodehelper.h"
 
 #include "core/include/fxcrt/fx_ext.h"
-#include "xfa/src/fxfa/src/common/xfa_docdata.h"
-#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
-#include "xfa/src/fxfa/src/common/xfa_document.h"
-#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
-#include "xfa/src/fxfa/src/common/xfa_localemgr.h"
-#include "xfa/src/fxfa/src/common/xfa_object.h"
-#include "xfa/src/fxfa/src/common/xfa_parser.h"
-#include "xfa/src/fxfa/src/common/xfa_script.h"
-#include "xfa/src/fxfa/src/common/xfa_utils.h"
-#include "xfa/src/fxfa/src/parser/xfa_script_imp.h"
+#include "xfa/src/fxfa/fm2js/xfa_fm2jsapi.h"
+#include "xfa/src/fxfa/parser/xfa_docdata.h"
+#include "xfa/src/fxfa/parser/xfa_doclayout.h"
+#include "xfa/src/fxfa/parser/xfa_document.h"
+#include "xfa/src/fxfa/parser/xfa_localemgr.h"
+#include "xfa/src/fxfa/parser/xfa_script_imp.h"
+#include "xfa/src/fxfa/parser/xfa_object.h"
+#include "xfa/src/fxfa/parser/xfa_parser.h"
+#include "xfa/src/fxfa/parser/xfa_script.h"
+#include "xfa/src/fxfa/parser/xfa_utils.h"
 
 CXFA_NodeHelper::CXFA_NodeHelper(void)
     : m_eLastCreateType(XFA_ELEMENT_DataValue),
diff --git a/xfa/src/fxfa/src/parser/xfa_script_nodehelper.h b/xfa/src/fxfa/parser/xfa_script_nodehelper.h
index b3dc86abc0..318a5a1ab3 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_nodehelper.h
+++ b/xfa/src/fxfa/parser/xfa_script_nodehelper.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_NODEHELPER_H_
-#define XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_NODEHELPER_H_
+#ifndef XFA_SRC_FXFA_PARSER_XFA_SCRIPT_NODEHELPER_H_
+#define XFA_SRC_FXFA_PARSER_XFA_SCRIPT_NODEHELPER_H_
 
-#include "xfa/src/fxfa/src/common/xfa_object.h"
-#include "xfa/src/fxfa/src/common/xfa_script.h"
+#include "xfa/src/fxfa/parser/xfa_object.h"
+#include "xfa/src/fxfa/parser/xfa_script.h"
 
 class CXFA_ScriptContext;
 
@@ -69,4 +69,4 @@ class CXFA_NodeHelper {
   CXFA_Node* m_pAllStartParent;
 };
 
-#endif  // XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_NODEHELPER_H_
+#endif  // XFA_SRC_FXFA_PARSER_XFA_SCRIPT_NODEHELPER_H_
diff --git a/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp b/xfa/src/fxfa/parser/xfa_script_resolveprocessor.cpp
index 2d4349b6f3..3f4a9c7b88 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp
+++ b/xfa/src/fxfa/parser/xfa_script_resolveprocessor.cpp
@@ -4,20 +4,20 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h"
+#include "xfa/src/fxfa/parser/xfa_script_resolveprocessor.h"
 
 #include "core/include/fxcrt/fx_ext.h"
-#include "xfa/src/fxfa/src/common/xfa_docdata.h"
-#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
-#include "xfa/src/fxfa/src/common/xfa_document.h"
-#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
-#include "xfa/src/fxfa/src/common/xfa_localemgr.h"
-#include "xfa/src/fxfa/src/common/xfa_object.h"
-#include "xfa/src/fxfa/src/common/xfa_parser.h"
-#include "xfa/src/fxfa/src/common/xfa_script.h"
-#include "xfa/src/fxfa/src/common/xfa_utils.h"
-#include "xfa/src/fxfa/src/parser/xfa_script_imp.h"
-#include "xfa/src/fxfa/src/parser/xfa_script_nodehelper.h"
+#include "xfa/src/fxfa/fm2js/xfa_fm2jsapi.h"
+#include "xfa/src/fxfa/parser/xfa_docdata.h"
+#include "xfa/src/fxfa/parser/xfa_doclayout.h"
+#include "xfa/src/fxfa/parser/xfa_document.h"
+#include "xfa/src/fxfa/parser/xfa_localemgr.h"
+#include "xfa/src/fxfa/parser/xfa_script_imp.h"
+#include "xfa/src/fxfa/parser/xfa_script_nodehelper.h"
+#include "xfa/src/fxfa/parser/xfa_object.h"
+#include "xfa/src/fxfa/parser/xfa_parser.h"
+#include "xfa/src/fxfa/parser/xfa_script.h"
+#include "xfa/src/fxfa/parser/xfa_utils.h"
 
 CXFA_ResolveProcessor::CXFA_ResolveProcessor(void)
     : m_pNodeHelper(NULL), m_iCurStart(0) {
diff --git a/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h b/xfa/src/fxfa/parser/xfa_script_resolveprocessor.h
index e2dbaf99b2..36e89392da 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h
+++ b/xfa/src/fxfa/parser/xfa_script_resolveprocessor.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_RESOLVEPROCESSOR_H_
-#define XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_RESOLVEPROCESSOR_H_
+#ifndef XFA_SRC_FXFA_PARSER_XFA_SCRIPT_RESOLVEPROCESSOR_H_
+#define XFA_SRC_FXFA_PARSER_XFA_SCRIPT_RESOLVEPROCESSOR_H_
 
 #include "xfa/include/fxfa/fxfa_objectacc.h"
-#include "xfa/src/fxfa/src/common/xfa_object.h"
-#include "xfa/src/fxfa/src/common/xfa_script.h"
+#include "xfa/src/fxfa/parser/xfa_object.h"
+#include "xfa/src/fxfa/parser/xfa_script.h"
 
 class CXFA_NodeHelper;
 class CXFA_ScriptContext;
@@ -83,4 +83,4 @@ class CXFA_ResolveProcessor {
   int32_t m_iCurStart;
 };
 
-#endif  // XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_RESOLVEPROCESSOR_H_
+#endif  // XFA_SRC_FXFA_PARSER_XFA_SCRIPT_RESOLVEPROCESSOR_H_
diff --git a/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.cpp b/xfa/src/fxfa/parser/xfa_script_signaturepseudomodel.cpp
index 74bcaf8a7f..a721338864 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.cpp
+++ b/xfa/src/fxfa/parser/xfa_script_signaturepseudomodel.cpp
@@ -4,17 +4,17 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.h"
+#include "xfa/src/fxfa/parser/xfa_script_signaturepseudomodel.h"
 
-#include "xfa/src/fxfa/src/common/xfa_docdata.h"
-#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
-#include "xfa/src/fxfa/src/common/xfa_document.h"
-#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
-#include "xfa/src/fxfa/src/common/xfa_localemgr.h"
-#include "xfa/src/fxfa/src/common/xfa_object.h"
-#include "xfa/src/fxfa/src/common/xfa_parser.h"
-#include "xfa/src/fxfa/src/common/xfa_script.h"
-#include "xfa/src/fxfa/src/common/xfa_utils.h"
+#include "xfa/src/fxfa/fm2js/xfa_fm2jsapi.h"
+#include "xfa/src/fxfa/parser/xfa_docdata.h"
+#include "xfa/src/fxfa/parser/xfa_doclayout.h"
+#include "xfa/src/fxfa/parser/xfa_document.h"
+#include "xfa/src/fxfa/parser/xfa_localemgr.h"
+#include "xfa/src/fxfa/parser/xfa_object.h"
+#include "xfa/src/fxfa/parser/xfa_parser.h"
+#include "xfa/src/fxfa/parser/xfa_script.h"
+#include "xfa/src/fxfa/parser/xfa_utils.h"
 
 CScript_SignaturePseudoModel::CScript_SignaturePseudoModel(
     CXFA_Document* pDocument)
diff --git a/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.h b/xfa/src/fxfa/parser/xfa_script_signaturepseudomodel.h
index 6a956836b3..f7c64971d0 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.h
+++ b/xfa/src/fxfa/parser/xfa_script_signaturepseudomodel.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_SIGNATUREPSEUDOMODEL_H_
-#define XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_SIGNATUREPSEUDOMODEL_H_
+#ifndef XFA_SRC_FXFA_PARSER_XFA_SCRIPT_SIGNATUREPSEUDOMODEL_H_
+#define XFA_SRC_FXFA_PARSER_XFA_SCRIPT_SIGNATUREPSEUDOMODEL_H_
 
-#include "xfa/src/fxfa/src/common/xfa_object.h"
+#include "xfa/src/fxfa/parser/xfa_object.h"
 
 class CScript_SignaturePseudoModel : public CXFA_OrdinaryObject {
  public:
@@ -19,4 +19,4 @@ class CScript_SignaturePseudoModel : public CXFA_OrdinaryObject {
   void Script_SignaturePseudoModel_Clear(CFXJSE_Arguments* pArguments);
 };
 
-#endif  // XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_SIGNATUREPSEUDOMODEL_H_
+#endif  // XFA_SRC_FXFA_PARSER_XFA_SCRIPT_SIGNATUREPSEUDOMODEL_H_
diff --git a/xfa/src/fxfa/src/common/xfa_utils.h b/xfa/src/fxfa/parser/xfa_utils.h
index 1b344f85da..d0e70fb955 100644
--- a/xfa/src/fxfa/src/common/xfa_utils.h
+++ b/xfa/src/fxfa/parser/xfa_utils.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_UTILS_H_
-#define XFA_SRC_FXFA_SRC_COMMON_XFA_UTILS_H_
+#ifndef XFA_SRC_FXFA_PARSER_XFA_UTILS_H_
+#define XFA_SRC_FXFA_PARSER_XFA_UTILS_H_
 
 #include "xfa/include/fxfa/fxfa_basic.h"
 #include "xfa/src/fdp/include/fde_xml.h"
@@ -216,4 +216,4 @@ void XFA_DataExporter_RegenerateFormFile(CXFA_Node* pNode,
                                          const FX_CHAR* pChecksum = NULL,
                                          FX_BOOL bSaveXML = FALSE);
 
-#endif  // XFA_SRC_FXFA_SRC_COMMON_XFA_UTILS_H_
+#endif  // XFA_SRC_FXFA_PARSER_XFA_UTILS_H_
diff --git a/xfa/src/fxfa/src/parser/xfa_utils_imp.cpp b/xfa/src/fxfa/parser/xfa_utils_imp.cpp
index 0686401573..32f5ce125f 100644
--- a/xfa/src/fxfa/src/parser/xfa_utils_imp.cpp
+++ b/xfa/src/fxfa/parser/xfa_utils_imp.cpp
@@ -4,17 +4,18 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "xfa/src/fxfa/parser/xfa_utils.h"
+
 #include "core/include/fxcrt/fx_ext.h"
-#include "xfa/src/fxfa/src/common/fxfa_localevalue.h"
-#include "xfa/src/fxfa/src/common/xfa_docdata.h"
-#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
-#include "xfa/src/fxfa/src/common/xfa_document.h"
-#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
-#include "xfa/src/fxfa/src/common/xfa_localemgr.h"
-#include "xfa/src/fxfa/src/common/xfa_object.h"
-#include "xfa/src/fxfa/src/common/xfa_parser.h"
-#include "xfa/src/fxfa/src/common/xfa_script.h"
-#include "xfa/src/fxfa/src/common/xfa_utils.h"
+#include "xfa/src/fxfa/fm2js/xfa_fm2jsapi.h"
+#include "xfa/src/fxfa/parser/xfa_docdata.h"
+#include "xfa/src/fxfa/parser/xfa_doclayout.h"
+#include "xfa/src/fxfa/parser/xfa_document.h"
+#include "xfa/src/fxfa/parser/xfa_localemgr.h"
+#include "xfa/src/fxfa/parser/xfa_localevalue.h"
+#include "xfa/src/fxfa/parser/xfa_object.h"
+#include "xfa/src/fxfa/parser/xfa_parser.h"
+#include "xfa/src/fxfa/parser/xfa_script.h"
 
 CXFA_Node* XFA_CreateUIChild(CXFA_Node* pNode, XFA_ELEMENT& eWidgetType) {
   XFA_ELEMENT eType = pNode->GetClassID();
diff --git a/xfa/src/fxfa/src/parser/xfa_utils_imp_unittest.cpp b/xfa/src/fxfa/parser/xfa_utils_imp_unittest.cpp
index 29f90ed44b..d5f0e4a923 100644
--- a/xfa/src/fxfa/src/parser/xfa_utils_imp_unittest.cpp
+++ b/xfa/src/fxfa/parser/xfa_utils_imp_unittest.cpp
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "testing/gtest/include/gtest/gtest.h"
-#include "xfa/src/fxfa/src/common/xfa_utils.h"
+#include "xfa/src/fxfa/parser/xfa_utils.h"
 
 TEST(XfaUtilsImp, XFA_MapRotation) {
   struct TestCase {