diff --git a/BUILD.gn b/BUILD.gn
index 7d5232c..9cc4500 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1614,88 +1614,64 @@
       "xfa/fwl/theme/cfwl_utils.h",
       "xfa/fwl/theme/cfwl_widgettp.cpp",
       "xfa/fwl/theme/cfwl_widgettp.h",
-      "xfa/fxfa/app/cxfa_csstagprovider.cpp",
-      "xfa/fxfa/app/cxfa_csstagprovider.h",
-      "xfa/fxfa/app/cxfa_ffarc.cpp",
-      "xfa/fxfa/app/cxfa_ffarc.h",
-      "xfa/fxfa/app/cxfa_ffbarcode.cpp",
-      "xfa/fxfa/app/cxfa_ffbarcode.h",
-      "xfa/fxfa/app/cxfa_ffcheckbutton.cpp",
-      "xfa/fxfa/app/cxfa_ffcheckbutton.h",
-      "xfa/fxfa/app/cxfa_ffcombobox.cpp",
-      "xfa/fxfa/app/cxfa_ffcombobox.h",
-      "xfa/fxfa/app/cxfa_ffdatetimeedit.cpp",
-      "xfa/fxfa/app/cxfa_ffdatetimeedit.h",
-      "xfa/fxfa/app/cxfa_ffdraw.cpp",
-      "xfa/fxfa/app/cxfa_ffdraw.h",
-      "xfa/fxfa/app/cxfa_ffexclgroup.cpp",
-      "xfa/fxfa/app/cxfa_ffexclgroup.h",
-      "xfa/fxfa/app/cxfa_fffield.cpp",
-      "xfa/fxfa/app/cxfa_fffield.h",
-      "xfa/fxfa/app/cxfa_ffimage.cpp",
-      "xfa/fxfa/app/cxfa_ffimage.h",
-      "xfa/fxfa/app/cxfa_ffimageedit.cpp",
-      "xfa/fxfa/app/cxfa_ffimageedit.h",
-      "xfa/fxfa/app/cxfa_ffline.cpp",
-      "xfa/fxfa/app/cxfa_ffline.h",
-      "xfa/fxfa/app/cxfa_fflistbox.cpp",
-      "xfa/fxfa/app/cxfa_fflistbox.h",
-      "xfa/fxfa/app/cxfa_ffnotify.cpp",
-      "xfa/fxfa/app/cxfa_ffnotify.h",
-      "xfa/fxfa/app/cxfa_ffnumericedit.cpp",
-      "xfa/fxfa/app/cxfa_ffnumericedit.h",
-      "xfa/fxfa/app/cxfa_ffpasswordedit.cpp",
-      "xfa/fxfa/app/cxfa_ffpasswordedit.h",
-      "xfa/fxfa/app/cxfa_ffpushbutton.cpp",
-      "xfa/fxfa/app/cxfa_ffpushbutton.h",
-      "xfa/fxfa/app/cxfa_ffrectangle.cpp",
-      "xfa/fxfa/app/cxfa_ffrectangle.h",
-      "xfa/fxfa/app/cxfa_ffsignature.cpp",
-      "xfa/fxfa/app/cxfa_ffsignature.h",
-      "xfa/fxfa/app/cxfa_ffsubform.cpp",
-      "xfa/fxfa/app/cxfa_ffsubform.h",
-      "xfa/fxfa/app/cxfa_fftext.cpp",
-      "xfa/fxfa/app/cxfa_fftext.h",
-      "xfa/fxfa/app/cxfa_fftextedit.cpp",
-      "xfa/fxfa/app/cxfa_fftextedit.h",
-      "xfa/fxfa/app/cxfa_fwladapterwidgetmgr.cpp",
-      "xfa/fxfa/app/cxfa_fwladapterwidgetmgr.h",
-      "xfa/fxfa/app/cxfa_fwltheme.cpp",
-      "xfa/fxfa/app/cxfa_fwltheme.h",
-      "xfa/fxfa/app/cxfa_linkuserdata.cpp",
-      "xfa/fxfa/app/cxfa_linkuserdata.h",
-      "xfa/fxfa/app/cxfa_loadercontext.cpp",
-      "xfa/fxfa/app/cxfa_loadercontext.h",
-      "xfa/fxfa/app/cxfa_pieceline.cpp",
-      "xfa/fxfa/app/cxfa_pieceline.h",
-      "xfa/fxfa/app/cxfa_textlayout.cpp",
-      "xfa/fxfa/app/cxfa_textlayout.h",
-      "xfa/fxfa/app/cxfa_textparsecontext.cpp",
-      "xfa/fxfa/app/cxfa_textparsecontext.h",
-      "xfa/fxfa/app/cxfa_textparser.cpp",
-      "xfa/fxfa/app/cxfa_textparser.h",
-      "xfa/fxfa/app/cxfa_textpiece.cpp",
-      "xfa/fxfa/app/cxfa_textpiece.h",
-      "xfa/fxfa/app/cxfa_textprovider.cpp",
-      "xfa/fxfa/app/cxfa_textprovider.h",
-      "xfa/fxfa/app/cxfa_texttabstopscontext.cpp",
-      "xfa/fxfa/app/cxfa_texttabstopscontext.h",
-      "xfa/fxfa/app/cxfa_textuserdata.cpp",
-      "xfa/fxfa/app/cxfa_textuserdata.h",
+      "xfa/fxfa/cxfa_csstagprovider.cpp",
+      "xfa/fxfa/cxfa_csstagprovider.h",
       "xfa/fxfa/cxfa_deffontmgr.cpp",
       "xfa/fxfa/cxfa_deffontmgr.h",
       "xfa/fxfa/cxfa_eventparam.cpp",
       "xfa/fxfa/cxfa_eventparam.h",
       "xfa/fxfa/cxfa_ffapp.cpp",
       "xfa/fxfa/cxfa_ffapp.h",
+      "xfa/fxfa/cxfa_ffarc.cpp",
+      "xfa/fxfa/cxfa_ffarc.h",
+      "xfa/fxfa/cxfa_ffbarcode.cpp",
+      "xfa/fxfa/cxfa_ffbarcode.h",
+      "xfa/fxfa/cxfa_ffcheckbutton.cpp",
+      "xfa/fxfa/cxfa_ffcheckbutton.h",
+      "xfa/fxfa/cxfa_ffcombobox.cpp",
+      "xfa/fxfa/cxfa_ffcombobox.h",
+      "xfa/fxfa/cxfa_ffdatetimeedit.cpp",
+      "xfa/fxfa/cxfa_ffdatetimeedit.h",
       "xfa/fxfa/cxfa_ffdoc.cpp",
       "xfa/fxfa/cxfa_ffdoc.h",
       "xfa/fxfa/cxfa_ffdochandler.cpp",
       "xfa/fxfa/cxfa_ffdochandler.h",
       "xfa/fxfa/cxfa_ffdocview.cpp",
       "xfa/fxfa/cxfa_ffdocview.h",
+      "xfa/fxfa/cxfa_ffdraw.cpp",
+      "xfa/fxfa/cxfa_ffdraw.h",
+      "xfa/fxfa/cxfa_ffexclgroup.cpp",
+      "xfa/fxfa/cxfa_ffexclgroup.h",
+      "xfa/fxfa/cxfa_fffield.cpp",
+      "xfa/fxfa/cxfa_fffield.h",
+      "xfa/fxfa/cxfa_ffimage.cpp",
+      "xfa/fxfa/cxfa_ffimage.h",
+      "xfa/fxfa/cxfa_ffimageedit.cpp",
+      "xfa/fxfa/cxfa_ffimageedit.h",
+      "xfa/fxfa/cxfa_ffline.cpp",
+      "xfa/fxfa/cxfa_ffline.h",
+      "xfa/fxfa/cxfa_fflistbox.cpp",
+      "xfa/fxfa/cxfa_fflistbox.h",
+      "xfa/fxfa/cxfa_ffnotify.cpp",
+      "xfa/fxfa/cxfa_ffnotify.h",
+      "xfa/fxfa/cxfa_ffnumericedit.cpp",
+      "xfa/fxfa/cxfa_ffnumericedit.h",
       "xfa/fxfa/cxfa_ffpageview.cpp",
       "xfa/fxfa/cxfa_ffpageview.h",
+      "xfa/fxfa/cxfa_ffpasswordedit.cpp",
+      "xfa/fxfa/cxfa_ffpasswordedit.h",
+      "xfa/fxfa/cxfa_ffpushbutton.cpp",
+      "xfa/fxfa/cxfa_ffpushbutton.h",
+      "xfa/fxfa/cxfa_ffrectangle.cpp",
+      "xfa/fxfa/cxfa_ffrectangle.h",
+      "xfa/fxfa/cxfa_ffsignature.cpp",
+      "xfa/fxfa/cxfa_ffsignature.h",
+      "xfa/fxfa/cxfa_ffsubform.cpp",
+      "xfa/fxfa/cxfa_ffsubform.h",
+      "xfa/fxfa/cxfa_fftext.cpp",
+      "xfa/fxfa/cxfa_fftext.h",
+      "xfa/fxfa/cxfa_fftextedit.cpp",
+      "xfa/fxfa/cxfa_fftextedit.h",
       "xfa/fxfa/cxfa_ffwidget.cpp",
       "xfa/fxfa/cxfa_ffwidget.h",
       "xfa/fxfa/cxfa_ffwidgethandler.cpp",
@@ -1704,10 +1680,34 @@
       "xfa/fxfa/cxfa_fileread.h",
       "xfa/fxfa/cxfa_fontmgr.cpp",
       "xfa/fxfa/cxfa_fontmgr.h",
+      "xfa/fxfa/cxfa_fwladapterwidgetmgr.cpp",
+      "xfa/fxfa/cxfa_fwladapterwidgetmgr.h",
+      "xfa/fxfa/cxfa_fwltheme.cpp",
+      "xfa/fxfa/cxfa_fwltheme.h",
+      "xfa/fxfa/cxfa_linkuserdata.cpp",
+      "xfa/fxfa/cxfa_linkuserdata.h",
+      "xfa/fxfa/cxfa_loadercontext.cpp",
+      "xfa/fxfa/cxfa_loadercontext.h",
       "xfa/fxfa/cxfa_pdffontmgr.cpp",
       "xfa/fxfa/cxfa_pdffontmgr.h",
+      "xfa/fxfa/cxfa_pieceline.cpp",
+      "xfa/fxfa/cxfa_pieceline.h",
       "xfa/fxfa/cxfa_rendercontext.cpp",
       "xfa/fxfa/cxfa_rendercontext.h",
+      "xfa/fxfa/cxfa_textlayout.cpp",
+      "xfa/fxfa/cxfa_textlayout.h",
+      "xfa/fxfa/cxfa_textparsecontext.cpp",
+      "xfa/fxfa/cxfa_textparsecontext.h",
+      "xfa/fxfa/cxfa_textparser.cpp",
+      "xfa/fxfa/cxfa_textparser.h",
+      "xfa/fxfa/cxfa_textpiece.cpp",
+      "xfa/fxfa/cxfa_textpiece.h",
+      "xfa/fxfa/cxfa_textprovider.cpp",
+      "xfa/fxfa/cxfa_textprovider.h",
+      "xfa/fxfa/cxfa_texttabstopscontext.cpp",
+      "xfa/fxfa/cxfa_texttabstopscontext.h",
+      "xfa/fxfa/cxfa_textuserdata.cpp",
+      "xfa/fxfa/cxfa_textuserdata.h",
       "xfa/fxfa/cxfa_widgetacc.cpp",
       "xfa/fxfa/cxfa_widgetacc.h",
       "xfa/fxfa/cxfa_widgetacciterator.cpp",
@@ -1954,9 +1954,9 @@
       "xfa/fgas/crt/cfgas_formatstring_unittest.cpp",
       "xfa/fgas/layout/cfx_rtfbreak_unittest.cpp",
       "xfa/fwl/cfx_barcode_unittest.cpp",
-      "xfa/fxfa/app/cxfa_ffbarcode_unittest.cpp",
-      "xfa/fxfa/app/cxfa_textparser_unittest.cpp",
       "xfa/fxfa/cxfa_ffapp_unittest.cpp",
+      "xfa/fxfa/cxfa_ffbarcode_unittest.cpp",
+      "xfa/fxfa/cxfa_textparser_unittest.cpp",
       "xfa/fxfa/fm2js/cxfa_fmlexer_unittest.cpp",
       "xfa/fxfa/fm2js/cxfa_fmparse_unittest.cpp",
       "xfa/fxfa/fm2js/cxfa_fmsimpleexpression_unittest.cpp",
diff --git a/xfa/fde/css/cfde_cssstyleselector.cpp b/xfa/fde/css/cfde_cssstyleselector.cpp
index 2fe306f..2213feb 100644
--- a/xfa/fde/css/cfde_cssstyleselector.cpp
+++ b/xfa/fde/css/cfde_cssstyleselector.cpp
@@ -21,7 +21,7 @@
 #include "xfa/fde/css/cfde_cssstylesheet.h"
 #include "xfa/fde/css/cfde_csssyntaxparser.h"
 #include "xfa/fde/css/cfde_cssvaluelist.h"
-#include "xfa/fxfa/app/cxfa_csstagprovider.h"
+#include "xfa/fxfa/cxfa_csstagprovider.h"
 
 CFDE_CSSStyleSelector::CFDE_CSSStyleSelector(CFGAS_FontMgr* pFontMgr)
     : m_pFontMgr(pFontMgr), m_fDefFontSize(12.0f) {}
diff --git a/xfa/fgas/layout/cfx_breakpiece.h b/xfa/fgas/layout/cfx_breakpiece.h
index 807b5f7..668245f 100644
--- a/xfa/fgas/layout/cfx_breakpiece.h
+++ b/xfa/fgas/layout/cfx_breakpiece.h
@@ -13,7 +13,7 @@
 #include "core/fxcrt/cfx_retain_ptr.h"
 #include "core/fxcrt/cfx_unowned_ptr.h"
 #include "core/fxcrt/fx_string.h"
-#include "xfa/fxfa/app/cxfa_textuserdata.h"
+#include "xfa/fxfa/cxfa_textuserdata.h"
 
 class CFX_BreakPiece {
  public:
diff --git a/xfa/fgas/layout/cfx_rtfbreak.h b/xfa/fgas/layout/cfx_rtfbreak.h
index f900dcb..bc5ab4a 100644
--- a/xfa/fgas/layout/cfx_rtfbreak.h
+++ b/xfa/fgas/layout/cfx_rtfbreak.h
@@ -16,7 +16,7 @@
 #include "core/fxcrt/fx_ucd.h"
 #include "core/fxge/cfx_renderdevice.h"
 #include "xfa/fgas/layout/cfx_break.h"
-#include "xfa/fxfa/app/cxfa_textuserdata.h"
+#include "xfa/fxfa/cxfa_textuserdata.h"
 
 class CFGAS_GEFont;
 
diff --git a/xfa/fwl/cfwl_app.cpp b/xfa/fwl/cfwl_app.cpp
index e762125..58ca93d 100644
--- a/xfa/fwl/cfwl_app.cpp
+++ b/xfa/fwl/cfwl_app.cpp
@@ -10,7 +10,7 @@
 #include "xfa/fwl/cfwl_notedriver.h"
 #include "xfa/fwl/cfwl_widget.h"
 #include "xfa/fwl/cfwl_widgetmgr.h"
-#include "xfa/fxfa/app/cxfa_fwladapterwidgetmgr.h"
+#include "xfa/fxfa/cxfa_fwladapterwidgetmgr.h"
 
 CFWL_App::CFWL_App(CXFA_FFApp* pAdapter)
     : m_pAdapterNative(pAdapter),
diff --git a/xfa/fwl/cfwl_widgetmgr.cpp b/xfa/fwl/cfwl_widgetmgr.cpp
index eb98f2e..d5b496a 100644
--- a/xfa/fwl/cfwl_widgetmgr.cpp
+++ b/xfa/fwl/cfwl_widgetmgr.cpp
@@ -12,8 +12,8 @@
 #include "xfa/fwl/cfwl_app.h"
 #include "xfa/fwl/cfwl_form.h"
 #include "xfa/fwl/cfwl_notedriver.h"
-#include "xfa/fxfa/app/cxfa_fwladapterwidgetmgr.h"
 #include "xfa/fxfa/cxfa_ffapp.h"
+#include "xfa/fxfa/cxfa_fwladapterwidgetmgr.h"
 
 namespace {
 
diff --git a/xfa/fwl/theme/cfwl_edittp.cpp b/xfa/fwl/theme/cfwl_edittp.cpp
index b04136b..19486fe 100644
--- a/xfa/fwl/theme/cfwl_edittp.cpp
+++ b/xfa/fwl/theme/cfwl_edittp.cpp
@@ -9,8 +9,8 @@
 #include "xfa/fwl/cfwl_edit.h"
 #include "xfa/fwl/cfwl_themebackground.h"
 #include "xfa/fwl/cfwl_widget.h"
-#include "xfa/fxfa/app/cxfa_fwltheme.h"
 #include "xfa/fxfa/cxfa_ffwidget.h"
+#include "xfa/fxfa/cxfa_fwltheme.h"
 #include "xfa/fxgraphics/cxfa_color.h"
 #include "xfa/fxgraphics/cxfa_path.h"
 
diff --git a/xfa/fxfa/app/cxfa_csstagprovider.cpp b/xfa/fxfa/cxfa_csstagprovider.cpp
similarity index 89%
rename from xfa/fxfa/app/cxfa_csstagprovider.cpp
rename to xfa/fxfa/cxfa_csstagprovider.cpp
index ef5133e..98d00d4 100644
--- a/xfa/fxfa/app/cxfa_csstagprovider.cpp
+++ b/xfa/fxfa/cxfa_csstagprovider.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxfa/app/cxfa_csstagprovider.h"
+#include "xfa/fxfa/cxfa_csstagprovider.h"
 
 CXFA_CSSTagProvider::CXFA_CSSTagProvider()
     : m_bTagAvailable(false), m_bContent(false) {}
diff --git a/xfa/fxfa/app/cxfa_csstagprovider.h b/xfa/fxfa/cxfa_csstagprovider.h
similarity index 86%
rename from xfa/fxfa/app/cxfa_csstagprovider.h
rename to xfa/fxfa/cxfa_csstagprovider.h
index f5db867..058740b 100644
--- a/xfa/fxfa/app/cxfa_csstagprovider.h
+++ b/xfa/fxfa/cxfa_csstagprovider.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXFA_APP_CXFA_CSSTAGPROVIDER_H_
-#define XFA_FXFA_APP_CXFA_CSSTAGPROVIDER_H_
+#ifndef XFA_FXFA_CXFA_CSSTAGPROVIDER_H_
+#define XFA_FXFA_CXFA_CSSTAGPROVIDER_H_
 
 #include <map>
 
@@ -36,4 +36,4 @@
   std::map<CFX_WideString, CFX_WideString> m_Attributes;
 };
 
-#endif  // XFA_FXFA_APP_CXFA_CSSTAGPROVIDER_H_
+#endif  // XFA_FXFA_CXFA_CSSTAGPROVIDER_H_
diff --git a/xfa/fxfa/cxfa_ffapp.cpp b/xfa/fxfa/cxfa_ffapp.cpp
index cb308f2..b766cdc 100644
--- a/xfa/fxfa/cxfa_ffapp.cpp
+++ b/xfa/fxfa/cxfa_ffapp.cpp
@@ -16,12 +16,12 @@
 #include "xfa/fgas/font/cfgas_fontmgr.h"
 #include "xfa/fwl/cfwl_notedriver.h"
 #include "xfa/fwl/cfwl_widgetmgr.h"
-#include "xfa/fxfa/app/cxfa_fwladapterwidgetmgr.h"
-#include "xfa/fxfa/app/cxfa_fwltheme.h"
 #include "xfa/fxfa/cxfa_ffdoc.h"
 #include "xfa/fxfa/cxfa_ffdochandler.h"
 #include "xfa/fxfa/cxfa_ffwidgethandler.h"
 #include "xfa/fxfa/cxfa_fontmgr.h"
+#include "xfa/fxfa/cxfa_fwladapterwidgetmgr.h"
+#include "xfa/fxfa/cxfa_fwltheme.h"
 
 CXFA_FFApp::CXFA_FFApp(IXFA_AppProvider* pProvider) : m_pProvider(pProvider) {
   // Ensure fully initialized before making an app based on |this|.
diff --git a/xfa/fxfa/app/cxfa_ffarc.cpp b/xfa/fxfa/cxfa_ffarc.cpp
similarity index 95%
rename from xfa/fxfa/app/cxfa_ffarc.cpp
rename to xfa/fxfa/cxfa_ffarc.cpp
index 1a12fb5..6c2fa4e 100644
--- a/xfa/fxfa/app/cxfa_ffarc.cpp
+++ b/xfa/fxfa/cxfa_ffarc.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxfa/app/cxfa_ffarc.h"
+#include "xfa/fxfa/cxfa_ffarc.h"
 
 CXFA_FFArc::CXFA_FFArc(CXFA_WidgetAcc* pDataAcc) : CXFA_FFDraw(pDataAcc) {}
 
diff --git a/xfa/fxfa/app/cxfa_ffarc.h b/xfa/fxfa/cxfa_ffarc.h
similarity index 78%
rename from xfa/fxfa/app/cxfa_ffarc.h
rename to xfa/fxfa/cxfa_ffarc.h
index f1bc82f..7d8aabc 100644
--- a/xfa/fxfa/app/cxfa_ffarc.h
+++ b/xfa/fxfa/cxfa_ffarc.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXFA_APP_CXFA_FFARC_H_
-#define XFA_FXFA_APP_CXFA_FFARC_H_
+#ifndef XFA_FXFA_CXFA_FFARC_H_
+#define XFA_FXFA_CXFA_FFARC_H_
 
-#include "xfa/fxfa/app/cxfa_ffdraw.h"
+#include "xfa/fxfa/cxfa_ffdraw.h"
 
 class CXFA_FFArc : public CXFA_FFDraw {
  public:
@@ -20,4 +20,4 @@
                     uint32_t dwStatus) override;
 };
 
-#endif  // XFA_FXFA_APP_CXFA_FFARC_H_
+#endif  // XFA_FXFA_CXFA_FFARC_H_
diff --git a/xfa/fxfa/app/cxfa_ffbarcode.cpp b/xfa/fxfa/cxfa_ffbarcode.cpp
similarity index 98%
rename from xfa/fxfa/app/cxfa_ffbarcode.cpp
rename to xfa/fxfa/cxfa_ffbarcode.cpp
index 7bbb60d..eff9cec 100644
--- a/xfa/fxfa/app/cxfa_ffbarcode.cpp
+++ b/xfa/fxfa/cxfa_ffbarcode.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxfa/app/cxfa_ffbarcode.h"
+#include "xfa/fxfa/cxfa_ffbarcode.h"
 
 #include <utility>
 
@@ -13,10 +13,10 @@
 #include "xfa/fwl/cfwl_app.h"
 #include "xfa/fwl/cfwl_barcode.h"
 #include "xfa/fwl/cfwl_notedriver.h"
-#include "xfa/fxfa/app/cxfa_fffield.h"
-#include "xfa/fxfa/app/cxfa_fwladapterwidgetmgr.h"
+#include "xfa/fxfa/cxfa_fffield.h"
 #include "xfa/fxfa/cxfa_ffpageview.h"
 #include "xfa/fxfa/cxfa_ffwidget.h"
+#include "xfa/fxfa/cxfa_fwladapterwidgetmgr.h"
 
 namespace {
 
diff --git a/xfa/fxfa/app/cxfa_ffbarcode.h b/xfa/fxfa/cxfa_ffbarcode.h
similarity index 91%
rename from xfa/fxfa/app/cxfa_ffbarcode.h
rename to xfa/fxfa/cxfa_ffbarcode.h
index 782aec3..c9b36b3 100644
--- a/xfa/fxfa/app/cxfa_ffbarcode.h
+++ b/xfa/fxfa/cxfa_ffbarcode.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXFA_APP_CXFA_FFBARCODE_H_
-#define XFA_FXFA_APP_CXFA_FFBARCODE_H_
+#ifndef XFA_FXFA_CXFA_FFBARCODE_H_
+#define XFA_FXFA_CXFA_FFBARCODE_H_
 
 #include "fxbarcode/BC_Library.h"
-#include "xfa/fxfa/app/cxfa_fftextedit.h"
 #include "xfa/fxfa/cxfa_ffpageview.h"
+#include "xfa/fxfa/cxfa_fftextedit.h"
 
 enum class BarcodeType {
   aztec,
@@ -100,4 +100,4 @@
   bool OnRButtonDown(uint32_t dwFlags, const CFX_PointF& point) override;
 };
 
-#endif  // XFA_FXFA_APP_CXFA_FFBARCODE_H_
+#endif  // XFA_FXFA_CXFA_FFBARCODE_H_
diff --git a/xfa/fxfa/app/cxfa_ffbarcode_unittest.cpp b/xfa/fxfa/cxfa_ffbarcode_unittest.cpp
similarity index 95%
rename from xfa/fxfa/app/cxfa_ffbarcode_unittest.cpp
rename to xfa/fxfa/cxfa_ffbarcode_unittest.cpp
index 65e44ad..455b5a6 100644
--- a/xfa/fxfa/app/cxfa_ffbarcode_unittest.cpp
+++ b/xfa/fxfa/cxfa_ffbarcode_unittest.cpp
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "xfa/fxfa/app/cxfa_ffbarcode.h"
+#include "xfa/fxfa/cxfa_ffbarcode.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/base/ptr_util.h"
diff --git a/xfa/fxfa/app/cxfa_ffcheckbutton.cpp b/xfa/fxfa/cxfa_ffcheckbutton.cpp
similarity index 98%
rename from xfa/fxfa/app/cxfa_ffcheckbutton.cpp
rename to xfa/fxfa/cxfa_ffcheckbutton.cpp
index c3fd6b9..c1dae57 100644
--- a/xfa/fxfa/app/cxfa_ffcheckbutton.cpp
+++ b/xfa/fxfa/cxfa_ffcheckbutton.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxfa/app/cxfa_ffcheckbutton.h"
+#include "xfa/fxfa/cxfa_ffcheckbutton.h"
 
 #include <utility>
 #include "third_party/base/ptr_util.h"
@@ -12,11 +12,11 @@
 #include "xfa/fwl/cfwl_messagemouse.h"
 #include "xfa/fwl/cfwl_notedriver.h"
 #include "xfa/fwl/cfwl_widgetmgr.h"
-#include "xfa/fxfa/app/cxfa_ffexclgroup.h"
-#include "xfa/fxfa/app/cxfa_fffield.h"
 #include "xfa/fxfa/cxfa_ffapp.h"
 #include "xfa/fxfa/cxfa_ffdoc.h"
 #include "xfa/fxfa/cxfa_ffdocview.h"
+#include "xfa/fxfa/cxfa_ffexclgroup.h"
+#include "xfa/fxfa/cxfa_fffield.h"
 #include "xfa/fxfa/cxfa_ffpageview.h"
 #include "xfa/fxfa/cxfa_ffwidget.h"
 
diff --git a/xfa/fxfa/app/cxfa_ffcheckbutton.h b/xfa/fxfa/cxfa_ffcheckbutton.h
similarity index 88%
rename from xfa/fxfa/app/cxfa_ffcheckbutton.h
rename to xfa/fxfa/cxfa_ffcheckbutton.h
index f092abb..d6fd09d 100644
--- a/xfa/fxfa/app/cxfa_ffcheckbutton.h
+++ b/xfa/fxfa/cxfa_ffcheckbutton.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXFA_APP_CXFA_FFCHECKBUTTON_H_
-#define XFA_FXFA_APP_CXFA_FFCHECKBUTTON_H_
+#ifndef XFA_FXFA_CXFA_FFCHECKBUTTON_H_
+#define XFA_FXFA_CXFA_FFCHECKBUTTON_H_
 
-#include "xfa/fxfa/app/cxfa_fffield.h"
+#include "xfa/fxfa/cxfa_fffield.h"
 #include "xfa/fxfa/cxfa_ffpageview.h"
 
 class CXFA_FFCheckButton : public CXFA_FFField {
@@ -43,4 +43,4 @@
   CFX_RectF m_rtCheckBox;
 };
 
-#endif  // XFA_FXFA_APP_CXFA_FFCHECKBUTTON_H_
+#endif  // XFA_FXFA_CXFA_FFCHECKBUTTON_H_
diff --git a/xfa/fxfa/app/cxfa_ffcombobox.cpp b/xfa/fxfa/cxfa_ffcombobox.cpp
similarity index 99%
rename from xfa/fxfa/app/cxfa_ffcombobox.cpp
rename to xfa/fxfa/cxfa_ffcombobox.cpp
index c317c1d..e256616 100644
--- a/xfa/fxfa/app/cxfa_ffcombobox.cpp
+++ b/xfa/fxfa/cxfa_ffcombobox.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxfa/app/cxfa_ffcombobox.h"
+#include "xfa/fxfa/cxfa_ffcombobox.h"
 
 #include <utility>
 #include <vector>
diff --git a/xfa/fxfa/app/cxfa_ffcombobox.h b/xfa/fxfa/cxfa_ffcombobox.h
similarity index 92%
rename from xfa/fxfa/app/cxfa_ffcombobox.h
rename to xfa/fxfa/cxfa_ffcombobox.h
index de239b6..6c93646 100644
--- a/xfa/fxfa/app/cxfa_ffcombobox.h
+++ b/xfa/fxfa/cxfa_ffcombobox.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXFA_APP_CXFA_FFCOMBOBOX_H_
-#define XFA_FXFA_APP_CXFA_FFCOMBOBOX_H_
+#ifndef XFA_FXFA_CXFA_FFCOMBOBOX_H_
+#define XFA_FXFA_CXFA_FFCOMBOBOX_H_
 
-#include "xfa/fxfa/app/cxfa_fffield.h"
+#include "xfa/fxfa/cxfa_fffield.h"
 
 class CXFA_FFComboBox : public CXFA_FFField {
  public:
@@ -66,4 +66,4 @@
   IFWL_WidgetDelegate* m_pOldDelegate;
 };
 
-#endif  // XFA_FXFA_APP_CXFA_FFCOMBOBOX_H_
+#endif  // XFA_FXFA_CXFA_FFCOMBOBOX_H_
diff --git a/xfa/fxfa/app/cxfa_ffdatetimeedit.cpp b/xfa/fxfa/cxfa_ffdatetimeedit.cpp
similarity index 99%
rename from xfa/fxfa/app/cxfa_ffdatetimeedit.cpp
rename to xfa/fxfa/cxfa_ffdatetimeedit.cpp
index 10a7b18..b47175a 100644
--- a/xfa/fxfa/app/cxfa_ffdatetimeedit.cpp
+++ b/xfa/fxfa/cxfa_ffdatetimeedit.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxfa/app/cxfa_ffdatetimeedit.h"
+#include "xfa/fxfa/cxfa_ffdatetimeedit.h"
 
 #include <utility>
 
diff --git a/xfa/fxfa/app/cxfa_ffdatetimeedit.h b/xfa/fxfa/cxfa_ffdatetimeedit.h
similarity index 86%
rename from xfa/fxfa/app/cxfa_ffdatetimeedit.h
rename to xfa/fxfa/cxfa_ffdatetimeedit.h
index c62f657..8b95164 100644
--- a/xfa/fxfa/app/cxfa_ffdatetimeedit.h
+++ b/xfa/fxfa/cxfa_ffdatetimeedit.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXFA_APP_CXFA_FFDATETIMEEDIT_H_
-#define XFA_FXFA_APP_CXFA_FFDATETIMEEDIT_H_
+#ifndef XFA_FXFA_CXFA_FFDATETIMEEDIT_H_
+#define XFA_FXFA_CXFA_FFDATETIMEEDIT_H_
 
 #include "core/fxcrt/fx_coordinates.h"
-#include "xfa/fxfa/app/cxfa_fftextedit.h"
+#include "xfa/fxfa/cxfa_fftextedit.h"
 
 enum XFA_DATETIMETYPE {
   XFA_DATETIMETYPE_Date = 0,
@@ -44,4 +44,4 @@
   uint32_t GetAlignment();
 };
 
-#endif  // XFA_FXFA_APP_CXFA_FFDATETIMEEDIT_H_
+#endif  // XFA_FXFA_CXFA_FFDATETIMEEDIT_H_
diff --git a/xfa/fxfa/cxfa_ffdoc.cpp b/xfa/fxfa/cxfa_ffdoc.cpp
index 326fc7f..3ed0ea0 100644
--- a/xfa/fxfa/cxfa_ffdoc.cpp
+++ b/xfa/fxfa/cxfa_ffdoc.cpp
@@ -22,9 +22,9 @@
 #include "core/fxcrt/xml/cfx_xmlnode.h"
 #include "third_party/base/ptr_util.h"
 #include "xfa/fwl/cfwl_notedriver.h"
-#include "xfa/fxfa/app/cxfa_ffnotify.h"
 #include "xfa/fxfa/cxfa_ffapp.h"
 #include "xfa/fxfa/cxfa_ffdocview.h"
+#include "xfa/fxfa/cxfa_ffnotify.h"
 #include "xfa/fxfa/cxfa_ffwidget.h"
 #include "xfa/fxfa/cxfa_fileread.h"
 #include "xfa/fxfa/cxfa_fontmgr.h"
diff --git a/xfa/fxfa/cxfa_ffdocview.cpp b/xfa/fxfa/cxfa_ffdocview.cpp
index 03a692b..8d1ec23 100644
--- a/xfa/fxfa/cxfa_ffdocview.cpp
+++ b/xfa/fxfa/cxfa_ffdocview.cpp
@@ -9,24 +9,24 @@
 #include "core/fxcrt/fx_extension.h"
 #include "third_party/base/ptr_util.h"
 #include "third_party/base/stl_util.h"
-#include "xfa/fxfa/app/cxfa_ffbarcode.h"
-#include "xfa/fxfa/app/cxfa_ffcheckbutton.h"
-#include "xfa/fxfa/app/cxfa_ffdraw.h"
-#include "xfa/fxfa/app/cxfa_ffexclgroup.h"
-#include "xfa/fxfa/app/cxfa_fffield.h"
-#include "xfa/fxfa/app/cxfa_ffimage.h"
-#include "xfa/fxfa/app/cxfa_ffimageedit.h"
-#include "xfa/fxfa/app/cxfa_ffpushbutton.h"
-#include "xfa/fxfa/app/cxfa_ffsignature.h"
-#include "xfa/fxfa/app/cxfa_ffsubform.h"
-#include "xfa/fxfa/app/cxfa_fftext.h"
-#include "xfa/fxfa/app/cxfa_fwladapterwidgetmgr.h"
-#include "xfa/fxfa/app/cxfa_textprovider.h"
 #include "xfa/fxfa/cxfa_ffapp.h"
+#include "xfa/fxfa/cxfa_ffbarcode.h"
+#include "xfa/fxfa/cxfa_ffcheckbutton.h"
 #include "xfa/fxfa/cxfa_ffdoc.h"
+#include "xfa/fxfa/cxfa_ffdraw.h"
+#include "xfa/fxfa/cxfa_ffexclgroup.h"
+#include "xfa/fxfa/cxfa_fffield.h"
+#include "xfa/fxfa/cxfa_ffimage.h"
+#include "xfa/fxfa/cxfa_ffimageedit.h"
 #include "xfa/fxfa/cxfa_ffpageview.h"
+#include "xfa/fxfa/cxfa_ffpushbutton.h"
+#include "xfa/fxfa/cxfa_ffsignature.h"
+#include "xfa/fxfa/cxfa_ffsubform.h"
+#include "xfa/fxfa/cxfa_fftext.h"
 #include "xfa/fxfa/cxfa_ffwidget.h"
 #include "xfa/fxfa/cxfa_ffwidgethandler.h"
+#include "xfa/fxfa/cxfa_fwladapterwidgetmgr.h"
+#include "xfa/fxfa/cxfa_textprovider.h"
 #include "xfa/fxfa/cxfa_widgetacciterator.h"
 #include "xfa/fxfa/parser/cxfa_binditems.h"
 #include "xfa/fxfa/parser/cxfa_layoutprocessor.h"
diff --git a/xfa/fxfa/app/cxfa_ffdraw.cpp b/xfa/fxfa/cxfa_ffdraw.cpp
similarity index 92%
rename from xfa/fxfa/app/cxfa_ffdraw.cpp
rename to xfa/fxfa/cxfa_ffdraw.cpp
index 5736e77..9200733 100644
--- a/xfa/fxfa/app/cxfa_ffdraw.cpp
+++ b/xfa/fxfa/cxfa_ffdraw.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxfa/app/cxfa_ffdraw.h"
+#include "xfa/fxfa/cxfa_ffdraw.h"
 
 #include "xfa/fxfa/cxfa_ffapp.h"
 #include "xfa/fxfa/cxfa_ffdoc.h"
diff --git a/xfa/fxfa/app/cxfa_ffdraw.h b/xfa/fxfa/cxfa_ffdraw.h
similarity index 80%
rename from xfa/fxfa/app/cxfa_ffdraw.h
rename to xfa/fxfa/cxfa_ffdraw.h
index 2a65ad0..3ca106a 100644
--- a/xfa/fxfa/app/cxfa_ffdraw.h
+++ b/xfa/fxfa/cxfa_ffdraw.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXFA_APP_CXFA_FFDRAW_H_
-#define XFA_FXFA_APP_CXFA_FFDRAW_H_
+#ifndef XFA_FXFA_CXFA_FFDRAW_H_
+#define XFA_FXFA_CXFA_FFDRAW_H_
 
 #include "xfa/fxfa/cxfa_ffpageview.h"
 #include "xfa/fxfa/cxfa_ffwidget.h"
@@ -16,4 +16,4 @@
   ~CXFA_FFDraw() override;
 };
 
-#endif  // XFA_FXFA_APP_CXFA_FFDRAW_H_
+#endif  // XFA_FXFA_CXFA_FFDRAW_H_
diff --git a/xfa/fxfa/app/cxfa_ffexclgroup.cpp b/xfa/fxfa/cxfa_ffexclgroup.cpp
similarity index 95%
rename from xfa/fxfa/app/cxfa_ffexclgroup.cpp
rename to xfa/fxfa/cxfa_ffexclgroup.cpp
index c881a79..cf6fafa 100644
--- a/xfa/fxfa/app/cxfa_ffexclgroup.cpp
+++ b/xfa/fxfa/cxfa_ffexclgroup.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxfa/app/cxfa_ffexclgroup.h"
+#include "xfa/fxfa/cxfa_ffexclgroup.h"
 
 #include "xfa/fxfa/cxfa_ffapp.h"
 #include "xfa/fxfa/cxfa_ffdoc.h"
diff --git a/xfa/fxfa/app/cxfa_ffexclgroup.h b/xfa/fxfa/cxfa_ffexclgroup.h
similarity index 82%
rename from xfa/fxfa/app/cxfa_ffexclgroup.h
rename to xfa/fxfa/cxfa_ffexclgroup.h
index 3575ad3..a67b24b 100644
--- a/xfa/fxfa/app/cxfa_ffexclgroup.h
+++ b/xfa/fxfa/cxfa_ffexclgroup.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXFA_APP_CXFA_FFEXCLGROUP_H_
-#define XFA_FXFA_APP_CXFA_FFEXCLGROUP_H_
+#ifndef XFA_FXFA_CXFA_FFEXCLGROUP_H_
+#define XFA_FXFA_CXFA_FFEXCLGROUP_H_
 
 #include "xfa/fxfa/cxfa_ffpageview.h"
 #include "xfa/fxfa/cxfa_ffwidget.h"
@@ -21,4 +21,4 @@
                     uint32_t dwStatus) override;
 };
 
-#endif  // XFA_FXFA_APP_CXFA_FFEXCLGROUP_H_
+#endif  // XFA_FXFA_CXFA_FFEXCLGROUP_H_
diff --git a/xfa/fxfa/app/cxfa_fffield.cpp b/xfa/fxfa/cxfa_fffield.cpp
similarity index 99%
rename from xfa/fxfa/app/cxfa_fffield.cpp
rename to xfa/fxfa/cxfa_fffield.cpp
index bf98b99..2826589 100644
--- a/xfa/fxfa/app/cxfa_fffield.cpp
+++ b/xfa/fxfa/cxfa_fffield.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxfa/app/cxfa_fffield.h"
+#include "xfa/fxfa/cxfa_fffield.h"
 
 #include "xfa/fwl/cfwl_edit.h"
 #include "xfa/fwl/cfwl_eventmouse.h"
@@ -15,13 +15,13 @@
 #include "xfa/fwl/cfwl_messagesetfocus.h"
 #include "xfa/fwl/cfwl_picturebox.h"
 #include "xfa/fwl/cfwl_widgetmgr.h"
-#include "xfa/fxfa/app/cxfa_fwltheme.h"
-#include "xfa/fxfa/app/cxfa_textlayout.h"
 #include "xfa/fxfa/cxfa_ffapp.h"
 #include "xfa/fxfa/cxfa_ffdoc.h"
 #include "xfa/fxfa/cxfa_ffdocview.h"
 #include "xfa/fxfa/cxfa_ffpageview.h"
 #include "xfa/fxfa/cxfa_ffwidget.h"
+#include "xfa/fxfa/cxfa_fwltheme.h"
+#include "xfa/fxfa/cxfa_textlayout.h"
 #include "xfa/fxfa/parser/cxfa_node.h"
 #include "xfa/fxgraphics/cxfa_color.h"
 #include "xfa/fxgraphics/cxfa_path.h"
diff --git a/xfa/fxfa/app/cxfa_fffield.h b/xfa/fxfa/cxfa_fffield.h
similarity index 96%
rename from xfa/fxfa/app/cxfa_fffield.h
rename to xfa/fxfa/cxfa_fffield.h
index d2eba09..06f7a2d 100644
--- a/xfa/fxfa/app/cxfa_fffield.h
+++ b/xfa/fxfa/cxfa_fffield.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXFA_APP_CXFA_FFFIELD_H_
-#define XFA_FXFA_APP_CXFA_FFFIELD_H_
+#ifndef XFA_FXFA_CXFA_FFFIELD_H_
+#define XFA_FXFA_CXFA_FFFIELD_H_
 
 #include <memory>
 
@@ -96,4 +96,4 @@
   CFX_RectF m_rtCaption;
 };
 
-#endif  // XFA_FXFA_APP_CXFA_FFFIELD_H_
+#endif  // XFA_FXFA_CXFA_FFFIELD_H_
diff --git a/xfa/fxfa/app/cxfa_ffimage.cpp b/xfa/fxfa/cxfa_ffimage.cpp
similarity index 96%
rename from xfa/fxfa/app/cxfa_ffimage.cpp
rename to xfa/fxfa/cxfa_ffimage.cpp
index cfcc9d6..75f8c36 100644
--- a/xfa/fxfa/app/cxfa_ffimage.cpp
+++ b/xfa/fxfa/cxfa_ffimage.cpp
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxfa/app/cxfa_ffimage.h"
+#include "xfa/fxfa/cxfa_ffimage.h"
 
-#include "xfa/fxfa/app/cxfa_ffdraw.h"
 #include "xfa/fxfa/cxfa_ffapp.h"
 #include "xfa/fxfa/cxfa_ffdoc.h"
+#include "xfa/fxfa/cxfa_ffdraw.h"
 #include "xfa/fxfa/cxfa_ffpageview.h"
 #include "xfa/fxfa/cxfa_ffwidget.h"
 
diff --git a/xfa/fxfa/app/cxfa_ffimage.h b/xfa/fxfa/cxfa_ffimage.h
similarity index 80%
rename from xfa/fxfa/app/cxfa_ffimage.h
rename to xfa/fxfa/cxfa_ffimage.h
index aaa5df4..e58983f 100644
--- a/xfa/fxfa/app/cxfa_ffimage.h
+++ b/xfa/fxfa/cxfa_ffimage.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXFA_APP_CXFA_FFIMAGE_H_
-#define XFA_FXFA_APP_CXFA_FFIMAGE_H_
+#ifndef XFA_FXFA_CXFA_FFIMAGE_H_
+#define XFA_FXFA_CXFA_FFIMAGE_H_
 
-#include "xfa/fxfa/app/cxfa_ffdraw.h"
+#include "xfa/fxfa/cxfa_ffdraw.h"
 
 class CXFA_FFImage : public CXFA_FFDraw {
  public:
@@ -23,4 +23,4 @@
   void UnloadWidget() override;
 };
 
-#endif  // XFA_FXFA_APP_CXFA_FFIMAGE_H_
+#endif  // XFA_FXFA_CXFA_FFIMAGE_H_
diff --git a/xfa/fxfa/app/cxfa_ffimageedit.cpp b/xfa/fxfa/cxfa_ffimageedit.cpp
similarity index 97%
rename from xfa/fxfa/app/cxfa_ffimageedit.cpp
rename to xfa/fxfa/cxfa_ffimageedit.cpp
index 4019dd1..02eeb98 100644
--- a/xfa/fxfa/app/cxfa_ffimageedit.cpp
+++ b/xfa/fxfa/cxfa_ffimageedit.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxfa/app/cxfa_ffimageedit.h"
+#include "xfa/fxfa/cxfa_ffimageedit.h"
 
 #include <utility>
 
@@ -13,9 +13,9 @@
 #include "xfa/fwl/cfwl_messagemouse.h"
 #include "xfa/fwl/cfwl_notedriver.h"
 #include "xfa/fwl/cfwl_picturebox.h"
-#include "xfa/fxfa/app/cxfa_fffield.h"
 #include "xfa/fxfa/cxfa_ffdoc.h"
 #include "xfa/fxfa/cxfa_ffdocview.h"
+#include "xfa/fxfa/cxfa_fffield.h"
 #include "xfa/fxfa/cxfa_ffpageview.h"
 #include "xfa/fxfa/cxfa_ffwidget.h"
 
diff --git a/xfa/fxfa/app/cxfa_ffimageedit.h b/xfa/fxfa/cxfa_ffimageedit.h
similarity index 86%
rename from xfa/fxfa/app/cxfa_ffimageedit.h
rename to xfa/fxfa/cxfa_ffimageedit.h
index c81af5e..2d0a649 100644
--- a/xfa/fxfa/app/cxfa_ffimageedit.h
+++ b/xfa/fxfa/cxfa_ffimageedit.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXFA_APP_CXFA_FFIMAGEEDIT_H_
-#define XFA_FXFA_APP_CXFA_FFIMAGEEDIT_H_
+#ifndef XFA_FXFA_CXFA_FFIMAGEEDIT_H_
+#define XFA_FXFA_CXFA_FFIMAGEEDIT_H_
 
-#include "xfa/fxfa/app/cxfa_fffield.h"
+#include "xfa/fxfa/cxfa_fffield.h"
 
 class CXFA_FFImageEdit : public CXFA_FFField {
  public:
@@ -34,4 +34,4 @@
   IFWL_WidgetDelegate* m_pOldDelegate;
 };
 
-#endif  // XFA_FXFA_APP_CXFA_FFIMAGEEDIT_H_
+#endif  // XFA_FXFA_CXFA_FFIMAGEEDIT_H_
diff --git a/xfa/fxfa/app/cxfa_ffline.cpp b/xfa/fxfa/cxfa_ffline.cpp
similarity index 98%
rename from xfa/fxfa/app/cxfa_ffline.cpp
rename to xfa/fxfa/cxfa_ffline.cpp
index 6c028dd..e371034 100644
--- a/xfa/fxfa/app/cxfa_ffline.cpp
+++ b/xfa/fxfa/cxfa_ffline.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxfa/app/cxfa_ffline.h"
+#include "xfa/fxfa/cxfa_ffline.h"
 
 #include "xfa/fxgraphics/cxfa_color.h"
 #include "xfa/fxgraphics/cxfa_graphics.h"
diff --git a/xfa/fxfa/app/cxfa_ffline.h b/xfa/fxfa/cxfa_ffline.h
similarity index 80%
rename from xfa/fxfa/app/cxfa_ffline.h
rename to xfa/fxfa/cxfa_ffline.h
index 7649f5a..a5c7ee1 100644
--- a/xfa/fxfa/app/cxfa_ffline.h
+++ b/xfa/fxfa/cxfa_ffline.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXFA_APP_CXFA_FFLINE_H_
-#define XFA_FXFA_APP_CXFA_FFLINE_H_
+#ifndef XFA_FXFA_CXFA_FFLINE_H_
+#define XFA_FXFA_CXFA_FFLINE_H_
 
-#include "xfa/fxfa/app/cxfa_ffdraw.h"
+#include "xfa/fxfa/cxfa_ffdraw.h"
 
 class CXFA_FFLine : public CXFA_FFDraw {
  public:
@@ -23,4 +23,4 @@
   void GetRectFromHand(CFX_RectF& rect, int32_t iHand, float fLineWidth);
 };
 
-#endif  // XFA_FXFA_APP_CXFA_FFLINE_H_
+#endif  // XFA_FXFA_CXFA_FFLINE_H_
diff --git a/xfa/fxfa/app/cxfa_fflistbox.cpp b/xfa/fxfa/cxfa_fflistbox.cpp
similarity index 99%
rename from xfa/fxfa/app/cxfa_fflistbox.cpp
rename to xfa/fxfa/cxfa_fflistbox.cpp
index cc9100b..c086953 100644
--- a/xfa/fxfa/app/cxfa_fflistbox.cpp
+++ b/xfa/fxfa/cxfa_fflistbox.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxfa/app/cxfa_fflistbox.h"
+#include "xfa/fxfa/cxfa_fflistbox.h"
 
 #include <algorithm>
 #include <utility>
diff --git a/xfa/fxfa/app/cxfa_fflistbox.h b/xfa/fxfa/cxfa_fflistbox.h
similarity index 87%
rename from xfa/fxfa/app/cxfa_fflistbox.h
rename to xfa/fxfa/cxfa_fflistbox.h
index ac563cc..f89df4c 100644
--- a/xfa/fxfa/app/cxfa_fflistbox.h
+++ b/xfa/fxfa/cxfa_fflistbox.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXFA_APP_CXFA_FFLISTBOX_H_
-#define XFA_FXFA_APP_CXFA_FFLISTBOX_H_
+#ifndef XFA_FXFA_CXFA_FFLISTBOX_H_
+#define XFA_FXFA_CXFA_FFLISTBOX_H_
 
-#include "xfa/fxfa/app/cxfa_fffield.h"
+#include "xfa/fxfa/cxfa_fffield.h"
 
 class CXFA_FFListBox : public CXFA_FFField {
  public:
@@ -37,4 +37,4 @@
   IFWL_WidgetDelegate* m_pOldDelegate;
 };
 
-#endif  // XFA_FXFA_APP_CXFA_FFLISTBOX_H_
+#endif  // XFA_FXFA_CXFA_FFLISTBOX_H_
diff --git a/xfa/fxfa/app/cxfa_ffnotify.cpp b/xfa/fxfa/cxfa_ffnotify.cpp
similarity index 93%
rename from xfa/fxfa/app/cxfa_ffnotify.cpp
rename to xfa/fxfa/cxfa_ffnotify.cpp
index a660fff..27ff31c 100644
--- a/xfa/fxfa/app/cxfa_ffnotify.cpp
+++ b/xfa/fxfa/cxfa_ffnotify.cpp
@@ -4,37 +4,37 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxfa/app/cxfa_ffnotify.h"
+#include "xfa/fxfa/cxfa_ffnotify.h"
 
 #include "fxjs/cfxjse_value.h"
-#include "xfa/fxfa/app/cxfa_ffarc.h"
-#include "xfa/fxfa/app/cxfa_ffbarcode.h"
-#include "xfa/fxfa/app/cxfa_ffcheckbutton.h"
-#include "xfa/fxfa/app/cxfa_ffcombobox.h"
-#include "xfa/fxfa/app/cxfa_ffdatetimeedit.h"
-#include "xfa/fxfa/app/cxfa_ffdraw.h"
-#include "xfa/fxfa/app/cxfa_ffexclgroup.h"
-#include "xfa/fxfa/app/cxfa_fffield.h"
-#include "xfa/fxfa/app/cxfa_ffimage.h"
-#include "xfa/fxfa/app/cxfa_ffimageedit.h"
-#include "xfa/fxfa/app/cxfa_ffline.h"
-#include "xfa/fxfa/app/cxfa_fflistbox.h"
-#include "xfa/fxfa/app/cxfa_ffnumericedit.h"
-#include "xfa/fxfa/app/cxfa_ffpasswordedit.h"
-#include "xfa/fxfa/app/cxfa_ffpushbutton.h"
-#include "xfa/fxfa/app/cxfa_ffrectangle.h"
-#include "xfa/fxfa/app/cxfa_ffsignature.h"
-#include "xfa/fxfa/app/cxfa_ffsubform.h"
-#include "xfa/fxfa/app/cxfa_fftext.h"
-#include "xfa/fxfa/app/cxfa_fwladapterwidgetmgr.h"
-#include "xfa/fxfa/app/cxfa_textlayout.h"
-#include "xfa/fxfa/app/cxfa_textprovider.h"
 #include "xfa/fxfa/cxfa_ffapp.h"
+#include "xfa/fxfa/cxfa_ffarc.h"
+#include "xfa/fxfa/cxfa_ffbarcode.h"
+#include "xfa/fxfa/cxfa_ffcheckbutton.h"
+#include "xfa/fxfa/cxfa_ffcombobox.h"
+#include "xfa/fxfa/cxfa_ffdatetimeedit.h"
 #include "xfa/fxfa/cxfa_ffdoc.h"
 #include "xfa/fxfa/cxfa_ffdocview.h"
+#include "xfa/fxfa/cxfa_ffdraw.h"
+#include "xfa/fxfa/cxfa_ffexclgroup.h"
+#include "xfa/fxfa/cxfa_fffield.h"
+#include "xfa/fxfa/cxfa_ffimage.h"
+#include "xfa/fxfa/cxfa_ffimageedit.h"
+#include "xfa/fxfa/cxfa_ffline.h"
+#include "xfa/fxfa/cxfa_fflistbox.h"
+#include "xfa/fxfa/cxfa_ffnumericedit.h"
 #include "xfa/fxfa/cxfa_ffpageview.h"
+#include "xfa/fxfa/cxfa_ffpasswordedit.h"
+#include "xfa/fxfa/cxfa_ffpushbutton.h"
+#include "xfa/fxfa/cxfa_ffrectangle.h"
+#include "xfa/fxfa/cxfa_ffsignature.h"
+#include "xfa/fxfa/cxfa_ffsubform.h"
+#include "xfa/fxfa/cxfa_fftext.h"
 #include "xfa/fxfa/cxfa_ffwidget.h"
 #include "xfa/fxfa/cxfa_ffwidgethandler.h"
+#include "xfa/fxfa/cxfa_fwladapterwidgetmgr.h"
+#include "xfa/fxfa/cxfa_textlayout.h"
+#include "xfa/fxfa/cxfa_textprovider.h"
 #include "xfa/fxfa/parser/cxfa_node.h"
 
 namespace {
diff --git a/xfa/fxfa/app/cxfa_ffnotify.h b/xfa/fxfa/cxfa_ffnotify.h
similarity index 95%
rename from xfa/fxfa/app/cxfa_ffnotify.h
rename to xfa/fxfa/cxfa_ffnotify.h
index 935a0c3..12aca5e 100644
--- a/xfa/fxfa/app/cxfa_ffnotify.h
+++ b/xfa/fxfa/cxfa_ffnotify.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXFA_APP_CXFA_FFNOTIFY_H_
-#define XFA_FXFA_APP_CXFA_FFNOTIFY_H_
+#ifndef XFA_FXFA_CXFA_FFNOTIFY_H_
+#define XFA_FXFA_CXFA_FFNOTIFY_H_
 
 #include "xfa/fxfa/cxfa_eventparam.h"
 #include "xfa/fxfa/parser/cxfa_document.h"
@@ -74,4 +74,4 @@
   CFX_UnownedPtr<CXFA_FFDoc> const m_pDoc;
 };
 
-#endif  // XFA_FXFA_APP_CXFA_FFNOTIFY_H_
+#endif  // XFA_FXFA_CXFA_FFNOTIFY_H_
diff --git a/xfa/fxfa/app/cxfa_ffnumericedit.cpp b/xfa/fxfa/cxfa_ffnumericedit.cpp
similarity index 98%
rename from xfa/fxfa/app/cxfa_ffnumericedit.cpp
rename to xfa/fxfa/cxfa_ffnumericedit.cpp
index 09ea524..b397753 100644
--- a/xfa/fxfa/app/cxfa_ffnumericedit.cpp
+++ b/xfa/fxfa/cxfa_ffnumericedit.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxfa/app/cxfa_ffnumericedit.h"
+#include "xfa/fxfa/cxfa_ffnumericedit.h"
 
 #include <utility>
 
diff --git a/xfa/fxfa/app/cxfa_ffnumericedit.h b/xfa/fxfa/cxfa_ffnumericedit.h
similarity index 80%
rename from xfa/fxfa/app/cxfa_ffnumericedit.h
rename to xfa/fxfa/cxfa_ffnumericedit.h
index 25e2304..ece0a49 100644
--- a/xfa/fxfa/app/cxfa_ffnumericedit.h
+++ b/xfa/fxfa/cxfa_ffnumericedit.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXFA_APP_CXFA_FFNUMERICEDIT_H_
-#define XFA_FXFA_APP_CXFA_FFNUMERICEDIT_H_
+#ifndef XFA_FXFA_CXFA_FFNUMERICEDIT_H_
+#define XFA_FXFA_CXFA_FFNUMERICEDIT_H_
 
 #include "core/fxcrt/fx_string.h"
-#include "xfa/fxfa/app/cxfa_fftextedit.h"
+#include "xfa/fxfa/cxfa_fftextedit.h"
 
 class CFWL_Event;
 class CFWL_Widget;
@@ -28,4 +28,4 @@
   bool OnValidate(CFWL_Widget* pWidget, CFX_WideString& wsText);
 };
 
-#endif  // XFA_FXFA_APP_CXFA_FFNUMERICEDIT_H_
+#endif  // XFA_FXFA_CXFA_FFNUMERICEDIT_H_
diff --git a/xfa/fxfa/cxfa_ffpageview.cpp b/xfa/fxfa/cxfa_ffpageview.cpp
index 8413186..9ba4432 100644
--- a/xfa/fxfa/cxfa_ffpageview.cpp
+++ b/xfa/fxfa/cxfa_ffpageview.cpp
@@ -13,14 +13,14 @@
 #include "third_party/base/ptr_util.h"
 #include "third_party/base/stl_util.h"
 #include "xfa/fde/cfde_rendercontext.h"
-#include "xfa/fxfa/app/cxfa_ffcheckbutton.h"
-#include "xfa/fxfa/app/cxfa_fffield.h"
-#include "xfa/fxfa/app/cxfa_ffimageedit.h"
-#include "xfa/fxfa/app/cxfa_ffpushbutton.h"
-#include "xfa/fxfa/app/cxfa_fwladapterwidgetmgr.h"
+#include "xfa/fxfa/cxfa_ffcheckbutton.h"
 #include "xfa/fxfa/cxfa_ffdoc.h"
 #include "xfa/fxfa/cxfa_ffdocview.h"
+#include "xfa/fxfa/cxfa_fffield.h"
+#include "xfa/fxfa/cxfa_ffimageedit.h"
+#include "xfa/fxfa/cxfa_ffpushbutton.h"
 #include "xfa/fxfa/cxfa_ffwidget.h"
+#include "xfa/fxfa/cxfa_fwladapterwidgetmgr.h"
 #include "xfa/fxfa/parser/cxfa_node.h"
 
 namespace {
diff --git a/xfa/fxfa/app/cxfa_ffpasswordedit.cpp b/xfa/fxfa/cxfa_ffpasswordedit.cpp
similarity index 97%
rename from xfa/fxfa/app/cxfa_ffpasswordedit.cpp
rename to xfa/fxfa/cxfa_ffpasswordedit.cpp
index 1b404fa..e0d9f33 100644
--- a/xfa/fxfa/app/cxfa_ffpasswordedit.cpp
+++ b/xfa/fxfa/cxfa_ffpasswordedit.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxfa/app/cxfa_ffpasswordedit.h"
+#include "xfa/fxfa/cxfa_ffpasswordedit.h"
 
 #include <utility>
 
diff --git a/xfa/fxfa/app/cxfa_ffpasswordedit.h b/xfa/fxfa/cxfa_ffpasswordedit.h
similarity index 74%
rename from xfa/fxfa/app/cxfa_ffpasswordedit.h
rename to xfa/fxfa/cxfa_ffpasswordedit.h
index 5d292d4..7ff3600 100644
--- a/xfa/fxfa/app/cxfa_ffpasswordedit.h
+++ b/xfa/fxfa/cxfa_ffpasswordedit.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXFA_APP_CXFA_FFPASSWORDEDIT_H_
-#define XFA_FXFA_APP_CXFA_FFPASSWORDEDIT_H_
+#ifndef XFA_FXFA_CXFA_FFPASSWORDEDIT_H_
+#define XFA_FXFA_CXFA_FFPASSWORDEDIT_H_
 
-#include "xfa/fxfa/app/cxfa_fftextedit.h"
+#include "xfa/fxfa/cxfa_fftextedit.h"
 
 class CXFA_WidgetAcc;
 
@@ -21,4 +21,4 @@
   void UpdateWidgetProperty() override;
 };
 
-#endif  // XFA_FXFA_APP_CXFA_FFPASSWORDEDIT_H_
+#endif  // XFA_FXFA_CXFA_FFPASSWORDEDIT_H_
diff --git a/xfa/fxfa/app/cxfa_ffpushbutton.cpp b/xfa/fxfa/cxfa_ffpushbutton.cpp
similarity index 97%
rename from xfa/fxfa/app/cxfa_ffpushbutton.cpp
rename to xfa/fxfa/cxfa_ffpushbutton.cpp
index 44ec0d4..a0594c7 100644
--- a/xfa/fxfa/app/cxfa_ffpushbutton.cpp
+++ b/xfa/fxfa/cxfa_ffpushbutton.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxfa/app/cxfa_ffpushbutton.h"
+#include "xfa/fxfa/cxfa_ffpushbutton.h"
 
 #include <utility>
 
@@ -12,12 +12,12 @@
 #include "xfa/fwl/cfwl_notedriver.h"
 #include "xfa/fwl/cfwl_pushbutton.h"
 #include "xfa/fwl/cfwl_widgetmgr.h"
-#include "xfa/fxfa/app/cxfa_fffield.h"
-#include "xfa/fxfa/app/cxfa_textlayout.h"
-#include "xfa/fxfa/app/cxfa_textprovider.h"
 #include "xfa/fxfa/cxfa_ffapp.h"
+#include "xfa/fxfa/cxfa_fffield.h"
 #include "xfa/fxfa/cxfa_ffpageview.h"
 #include "xfa/fxfa/cxfa_ffwidget.h"
+#include "xfa/fxfa/cxfa_textlayout.h"
+#include "xfa/fxfa/cxfa_textprovider.h"
 #include "xfa/fxgraphics/cxfa_color.h"
 #include "xfa/fxgraphics/cxfa_path.h"
 
diff --git a/xfa/fxfa/app/cxfa_ffpushbutton.h b/xfa/fxfa/cxfa_ffpushbutton.h
similarity index 90%
rename from xfa/fxfa/app/cxfa_ffpushbutton.h
rename to xfa/fxfa/cxfa_ffpushbutton.h
index e64ef70..e8b8909 100644
--- a/xfa/fxfa/app/cxfa_ffpushbutton.h
+++ b/xfa/fxfa/cxfa_ffpushbutton.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXFA_APP_CXFA_FFPUSHBUTTON_H_
-#define XFA_FXFA_APP_CXFA_FFPUSHBUTTON_H_
+#ifndef XFA_FXFA_CXFA_FFPUSHBUTTON_H_
+#define XFA_FXFA_CXFA_FFPUSHBUTTON_H_
 
 #include <memory>
 
-#include "xfa/fxfa/app/cxfa_fffield.h"
+#include "xfa/fxfa/cxfa_fffield.h"
 
 #define XFA_FWL_PSBSTYLEEXT_HiliteNone (0L << 0)
 #define XFA_FWL_PSBSTYLEEXT_HiliteInverted (1L << 0)
@@ -51,4 +51,4 @@
   IFWL_WidgetDelegate* m_pOldDelegate;
 };
 
-#endif  // XFA_FXFA_APP_CXFA_FFPUSHBUTTON_H_
+#endif  // XFA_FXFA_CXFA_FFPUSHBUTTON_H_
diff --git a/xfa/fxfa/app/cxfa_ffrectangle.cpp b/xfa/fxfa/cxfa_ffrectangle.cpp
similarity index 95%
rename from xfa/fxfa/app/cxfa_ffrectangle.cpp
rename to xfa/fxfa/cxfa_ffrectangle.cpp
index 89ae129..670ad2b 100644
--- a/xfa/fxfa/app/cxfa_ffrectangle.cpp
+++ b/xfa/fxfa/cxfa_ffrectangle.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxfa/app/cxfa_ffrectangle.h"
+#include "xfa/fxfa/cxfa_ffrectangle.h"
 
 CXFA_FFRectangle::CXFA_FFRectangle(CXFA_WidgetAcc* pDataAcc)
     : CXFA_FFDraw(pDataAcc) {}
diff --git a/xfa/fxfa/app/cxfa_ffrectangle.h b/xfa/fxfa/cxfa_ffrectangle.h
similarity index 76%
rename from xfa/fxfa/app/cxfa_ffrectangle.h
rename to xfa/fxfa/cxfa_ffrectangle.h
index 2ddb35d..bec5d08 100644
--- a/xfa/fxfa/app/cxfa_ffrectangle.h
+++ b/xfa/fxfa/cxfa_ffrectangle.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXFA_APP_CXFA_FFRECTANGLE_H_
-#define XFA_FXFA_APP_CXFA_FFRECTANGLE_H_
+#ifndef XFA_FXFA_CXFA_FFRECTANGLE_H_
+#define XFA_FXFA_CXFA_FFRECTANGLE_H_
 
-#include "xfa/fxfa/app/cxfa_ffdraw.h"
+#include "xfa/fxfa/cxfa_ffdraw.h"
 
 class CXFA_FFRectangle : public CXFA_FFDraw {
  public:
@@ -20,4 +20,4 @@
                     uint32_t dwStatus) override;
 };
 
-#endif  // XFA_FXFA_APP_CXFA_FFRECTANGLE_H_
+#endif  // XFA_FXFA_CXFA_FFRECTANGLE_H_
diff --git a/xfa/fxfa/app/cxfa_ffsignature.cpp b/xfa/fxfa/cxfa_ffsignature.cpp
similarity index 97%
rename from xfa/fxfa/app/cxfa_ffsignature.cpp
rename to xfa/fxfa/cxfa_ffsignature.cpp
index 0afe5cc..96de0a6 100644
--- a/xfa/fxfa/app/cxfa_ffsignature.cpp
+++ b/xfa/fxfa/cxfa_ffsignature.cpp
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxfa/app/cxfa_ffsignature.h"
+#include "xfa/fxfa/cxfa_ffsignature.h"
 
-#include "xfa/fxfa/app/cxfa_fffield.h"
 #include "xfa/fxfa/cxfa_ffdoc.h"
+#include "xfa/fxfa/cxfa_fffield.h"
 #include "xfa/fxfa/cxfa_ffpageview.h"
 #include "xfa/fxfa/cxfa_ffwidget.h"
 
diff --git a/xfa/fxfa/app/cxfa_ffsignature.h b/xfa/fxfa/cxfa_ffsignature.h
similarity index 90%
rename from xfa/fxfa/app/cxfa_ffsignature.h
rename to xfa/fxfa/cxfa_ffsignature.h
index 8d2a33e..b4b9f8e 100644
--- a/xfa/fxfa/app/cxfa_ffsignature.h
+++ b/xfa/fxfa/cxfa_ffsignature.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXFA_APP_CXFA_FFSIGNATURE_H_
-#define XFA_FXFA_APP_CXFA_FFSIGNATURE_H_
+#ifndef XFA_FXFA_CXFA_FFSIGNATURE_H_
+#define XFA_FXFA_CXFA_FFSIGNATURE_H_
 
-#include "xfa/fxfa/app/cxfa_fffield.h"
+#include "xfa/fxfa/cxfa_fffield.h"
 
 class CXFA_FFSignature final : public CXFA_FFField {
  public:
@@ -39,4 +39,4 @@
   bool OnSetCursor(const CFX_PointF& point) override;
 };
 
-#endif  // XFA_FXFA_APP_CXFA_FFSIGNATURE_H_
+#endif  // XFA_FXFA_CXFA_FFSIGNATURE_H_
diff --git a/xfa/fxfa/app/cxfa_ffsubform.cpp b/xfa/fxfa/cxfa_ffsubform.cpp
similarity index 92%
rename from xfa/fxfa/app/cxfa_ffsubform.cpp
rename to xfa/fxfa/cxfa_ffsubform.cpp
index 80a7782..9345e66 100644
--- a/xfa/fxfa/app/cxfa_ffsubform.cpp
+++ b/xfa/fxfa/cxfa_ffsubform.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxfa/app/cxfa_ffsubform.h"
+#include "xfa/fxfa/cxfa_ffsubform.h"
 
 #include "xfa/fxfa/cxfa_ffapp.h"
 #include "xfa/fxfa/cxfa_ffdoc.h"
diff --git a/xfa/fxfa/app/cxfa_ffsubform.h b/xfa/fxfa/cxfa_ffsubform.h
similarity index 79%
rename from xfa/fxfa/app/cxfa_ffsubform.h
rename to xfa/fxfa/cxfa_ffsubform.h
index d73e53d..051bd27 100644
--- a/xfa/fxfa/app/cxfa_ffsubform.h
+++ b/xfa/fxfa/cxfa_ffsubform.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXFA_APP_CXFA_FFSUBFORM_H_
-#define XFA_FXFA_APP_CXFA_FFSUBFORM_H_
+#ifndef XFA_FXFA_CXFA_FFSUBFORM_H_
+#define XFA_FXFA_CXFA_FFSUBFORM_H_
 
 #include "xfa/fxfa/cxfa_ffpageview.h"
 #include "xfa/fxfa/cxfa_ffwidget.h"
@@ -16,4 +16,4 @@
   ~CXFA_FFSubForm() override;
 };
 
-#endif  // XFA_FXFA_APP_CXFA_FFSUBFORM_H_
+#endif  // XFA_FXFA_CXFA_FFSUBFORM_H_
diff --git a/xfa/fxfa/app/cxfa_fftext.cpp b/xfa/fxfa/cxfa_fftext.cpp
similarity index 94%
rename from xfa/fxfa/app/cxfa_fftext.cpp
rename to xfa/fxfa/cxfa_fftext.cpp
index 3d90e6c..9b64623 100644
--- a/xfa/fxfa/app/cxfa_fftext.cpp
+++ b/xfa/fxfa/cxfa_fftext.cpp
@@ -4,19 +4,19 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxfa/app/cxfa_fftext.h"
+#include "xfa/fxfa/cxfa_fftext.h"
 
 #include "xfa/fwl/fwl_widgetdef.h"
 #include "xfa/fwl/fwl_widgethit.h"
-#include "xfa/fxfa/app/cxfa_ffdraw.h"
-#include "xfa/fxfa/app/cxfa_linkuserdata.h"
-#include "xfa/fxfa/app/cxfa_pieceline.h"
-#include "xfa/fxfa/app/cxfa_textlayout.h"
-#include "xfa/fxfa/app/cxfa_textpiece.h"
 #include "xfa/fxfa/cxfa_ffapp.h"
 #include "xfa/fxfa/cxfa_ffdoc.h"
+#include "xfa/fxfa/cxfa_ffdraw.h"
 #include "xfa/fxfa/cxfa_ffpageview.h"
 #include "xfa/fxfa/cxfa_ffwidget.h"
+#include "xfa/fxfa/cxfa_linkuserdata.h"
+#include "xfa/fxfa/cxfa_pieceline.h"
+#include "xfa/fxfa/cxfa_textlayout.h"
+#include "xfa/fxfa/cxfa_textpiece.h"
 #include "xfa/fxgraphics/cxfa_graphics.h"
 
 CXFA_FFText::CXFA_FFText(CXFA_WidgetAcc* pDataAcc) : CXFA_FFDraw(pDataAcc) {}
diff --git a/xfa/fxfa/app/cxfa_fftext.h b/xfa/fxfa/cxfa_fftext.h
similarity index 86%
rename from xfa/fxfa/app/cxfa_fftext.h
rename to xfa/fxfa/cxfa_fftext.h
index df920f0..00c57c7 100644
--- a/xfa/fxfa/app/cxfa_fftext.h
+++ b/xfa/fxfa/cxfa_fftext.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXFA_APP_CXFA_FFTEXT_H_
-#define XFA_FXFA_APP_CXFA_FFTEXT_H_
+#ifndef XFA_FXFA_CXFA_FFTEXT_H_
+#define XFA_FXFA_CXFA_FFTEXT_H_
 
-#include "xfa/fxfa/app/cxfa_ffdraw.h"
+#include "xfa/fxfa/cxfa_ffdraw.h"
 
 class CXFA_FFText : public CXFA_FFDraw {
  public:
@@ -29,4 +29,4 @@
   const wchar_t* GetLinkURLAtPoint(const CFX_PointF& point);
 };
 
-#endif  // XFA_FXFA_APP_CXFA_FFTEXT_H_
+#endif  // XFA_FXFA_CXFA_FFTEXT_H_
diff --git a/xfa/fxfa/app/cxfa_fftextedit.cpp b/xfa/fxfa/cxfa_fftextedit.cpp
similarity index 99%
rename from xfa/fxfa/app/cxfa_fftextedit.cpp
rename to xfa/fxfa/cxfa_fftextedit.cpp
index 0d211eb..9d6cffb 100644
--- a/xfa/fxfa/app/cxfa_fftextedit.cpp
+++ b/xfa/fxfa/cxfa_fftextedit.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxfa/app/cxfa_fftextedit.h"
+#include "xfa/fxfa/cxfa_fftextedit.h"
 
 #include <utility>
 
diff --git a/xfa/fxfa/app/cxfa_fftextedit.h b/xfa/fxfa/cxfa_fftextedit.h
similarity index 91%
rename from xfa/fxfa/app/cxfa_fftextedit.h
rename to xfa/fxfa/cxfa_fftextedit.h
index 109a31a..48656ad 100644
--- a/xfa/fxfa/app/cxfa_fftextedit.h
+++ b/xfa/fxfa/cxfa_fftextedit.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXFA_APP_CXFA_FFTEXTEDIT_H_
-#define XFA_FXFA_APP_CXFA_FFTEXTEDIT_H_
+#ifndef XFA_FXFA_CXFA_FFTEXTEDIT_H_
+#define XFA_FXFA_CXFA_FFTEXTEDIT_H_
 
 #include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/fx_string.h"
-#include "xfa/fxfa/app/cxfa_fffield.h"
+#include "xfa/fxfa/cxfa_fffield.h"
 
 class CFWL_Event;
 class CFWL_Widget;
@@ -54,4 +54,4 @@
   void ValidateNumberField(const CFX_WideString& wsText);
 };
 
-#endif  // XFA_FXFA_APP_CXFA_FFTEXTEDIT_H_
+#endif  // XFA_FXFA_CXFA_FFTEXTEDIT_H_
diff --git a/xfa/fxfa/cxfa_ffwidget.cpp b/xfa/fxfa/cxfa_ffwidget.cpp
index 2573ff4..8dc767e 100644
--- a/xfa/fxfa/cxfa_ffwidget.cpp
+++ b/xfa/fxfa/cxfa_ffwidget.cpp
@@ -21,12 +21,12 @@
 #include "core/fxge/dib/cfx_imagerenderer.h"
 #include "core/fxge/dib/cfx_imagetransformer.h"
 #include "xfa/fwl/fwl_widgethit.h"
-#include "xfa/fxfa/app/cxfa_textlayout.h"
 #include "xfa/fxfa/cxfa_eventparam.h"
 #include "xfa/fxfa/cxfa_ffapp.h"
 #include "xfa/fxfa/cxfa_ffdoc.h"
 #include "xfa/fxfa/cxfa_ffdocview.h"
 #include "xfa/fxfa/cxfa_ffpageview.h"
+#include "xfa/fxfa/cxfa_textlayout.h"
 #include "xfa/fxfa/cxfa_widgetacc.h"
 #include "xfa/fxfa/parser/cxfa_corner.h"
 #include "xfa/fxfa/parser/cxfa_node.h"
diff --git a/xfa/fxfa/cxfa_ffwidgethandler.cpp b/xfa/fxfa/cxfa_ffwidgethandler.cpp
index b703f74..c78b5e8 100644
--- a/xfa/fxfa/cxfa_ffwidgethandler.cpp
+++ b/xfa/fxfa/cxfa_ffwidgethandler.cpp
@@ -8,11 +8,11 @@
 
 #include <vector>
 
-#include "xfa/fxfa/app/cxfa_fffield.h"
-#include "xfa/fxfa/app/cxfa_fwladapterwidgetmgr.h"
 #include "xfa/fxfa/cxfa_ffdoc.h"
 #include "xfa/fxfa/cxfa_ffdocview.h"
+#include "xfa/fxfa/cxfa_fffield.h"
 #include "xfa/fxfa/cxfa_ffwidget.h"
+#include "xfa/fxfa/cxfa_fwladapterwidgetmgr.h"
 #include "xfa/fxfa/parser/cxfa_layoutprocessor.h"
 #include "xfa/fxfa/parser/cxfa_measurement.h"
 #include "xfa/fxfa/parser/cxfa_node.h"
diff --git a/xfa/fxfa/app/cxfa_fwladapterwidgetmgr.cpp b/xfa/fxfa/cxfa_fwladapterwidgetmgr.cpp
similarity index 92%
rename from xfa/fxfa/app/cxfa_fwladapterwidgetmgr.cpp
rename to xfa/fxfa/cxfa_fwladapterwidgetmgr.cpp
index 42362d8..f4e7527 100644
--- a/xfa/fxfa/app/cxfa_fwladapterwidgetmgr.cpp
+++ b/xfa/fxfa/cxfa_fwladapterwidgetmgr.cpp
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxfa/app/cxfa_fwladapterwidgetmgr.h"
+#include "xfa/fxfa/cxfa_fwladapterwidgetmgr.h"
 
-#include "xfa/fxfa/app/cxfa_fffield.h"
 #include "xfa/fxfa/cxfa_ffdoc.h"
+#include "xfa/fxfa/cxfa_fffield.h"
 
 CXFA_FWLAdapterWidgetMgr::CXFA_FWLAdapterWidgetMgr() {}
 
diff --git a/xfa/fxfa/app/cxfa_fwladapterwidgetmgr.h b/xfa/fxfa/cxfa_fwladapterwidgetmgr.h
similarity index 82%
rename from xfa/fxfa/app/cxfa_fwladapterwidgetmgr.h
rename to xfa/fxfa/cxfa_fwladapterwidgetmgr.h
index f9126ea..f5c4ce1 100644
--- a/xfa/fxfa/app/cxfa_fwladapterwidgetmgr.h
+++ b/xfa/fxfa/cxfa_fwladapterwidgetmgr.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXFA_APP_CXFA_FWLADAPTERWIDGETMGR_H_
-#define XFA_FXFA_APP_CXFA_FWLADAPTERWIDGETMGR_H_
+#ifndef XFA_FXFA_CXFA_FWLADAPTERWIDGETMGR_H_
+#define XFA_FXFA_CXFA_FWLADAPTERWIDGETMGR_H_
 
 #include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/fx_system.h"
@@ -25,4 +25,4 @@
                    CFX_RectF& rtPopup);
 };
 
-#endif  // XFA_FXFA_APP_CXFA_FWLADAPTERWIDGETMGR_H_
+#endif  // XFA_FXFA_CXFA_FWLADAPTERWIDGETMGR_H_
diff --git a/xfa/fxfa/app/cxfa_fwltheme.cpp b/xfa/fxfa/cxfa_fwltheme.cpp
similarity index 99%
rename from xfa/fxfa/app/cxfa_fwltheme.cpp
rename to xfa/fxfa/cxfa_fwltheme.cpp
index 5ad0873..89ce0db 100644
--- a/xfa/fxfa/app/cxfa_fwltheme.cpp
+++ b/xfa/fxfa/cxfa_fwltheme.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxfa/app/cxfa_fwltheme.h"
+#include "xfa/fxfa/cxfa_fwltheme.h"
 
 #include "core/fxcrt/fx_codepage.h"
 #include "xfa/fde/cfde_textout.h"
diff --git a/xfa/fxfa/app/cxfa_fwltheme.h b/xfa/fxfa/cxfa_fwltheme.h
similarity index 95%
rename from xfa/fxfa/app/cxfa_fwltheme.h
rename to xfa/fxfa/cxfa_fwltheme.h
index eaca990..9fbb068 100644
--- a/xfa/fxfa/app/cxfa_fwltheme.h
+++ b/xfa/fxfa/cxfa_fwltheme.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXFA_APP_CXFA_FWLTHEME_H_
-#define XFA_FXFA_APP_CXFA_FWLTHEME_H_
+#ifndef XFA_FXFA_CXFA_FWLTHEME_H_
+#define XFA_FXFA_CXFA_FWLTHEME_H_
 
 #include <memory>
 
@@ -67,4 +67,4 @@
 
 CXFA_FFWidget* XFA_ThemeGetOuterWidget(CFWL_Widget* pWidget);
 
-#endif  // XFA_FXFA_APP_CXFA_FWLTHEME_H_
+#endif  // XFA_FXFA_CXFA_FWLTHEME_H_
diff --git a/xfa/fxfa/app/cxfa_linkuserdata.cpp b/xfa/fxfa/cxfa_linkuserdata.cpp
similarity index 89%
rename from xfa/fxfa/app/cxfa_linkuserdata.cpp
rename to xfa/fxfa/cxfa_linkuserdata.cpp
index d657b28..c32b746 100644
--- a/xfa/fxfa/app/cxfa_linkuserdata.cpp
+++ b/xfa/fxfa/cxfa_linkuserdata.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxfa/app/cxfa_linkuserdata.h"
+#include "xfa/fxfa/cxfa_linkuserdata.h"
 
 CXFA_LinkUserData::CXFA_LinkUserData(wchar_t* pszText)
     : m_wsURLContent(pszText) {}
diff --git a/xfa/fxfa/app/cxfa_linkuserdata.h b/xfa/fxfa/cxfa_linkuserdata.h
similarity index 85%
rename from xfa/fxfa/app/cxfa_linkuserdata.h
rename to xfa/fxfa/cxfa_linkuserdata.h
index a3ccd92..a445aad 100644
--- a/xfa/fxfa/app/cxfa_linkuserdata.h
+++ b/xfa/fxfa/cxfa_linkuserdata.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXFA_APP_CXFA_LINKUSERDATA_H_
-#define XFA_FXFA_APP_CXFA_LINKUSERDATA_H_
+#ifndef XFA_FXFA_CXFA_LINKUSERDATA_H_
+#define XFA_FXFA_CXFA_LINKUSERDATA_H_
 
 #include "core/fxcrt/cfx_retain_ptr.h"
 #include "core/fxcrt/fx_basic.h"
@@ -26,4 +26,4 @@
   CFX_WideString m_wsURLContent;
 };
 
-#endif  // XFA_FXFA_APP_CXFA_LINKUSERDATA_H_
+#endif  // XFA_FXFA_CXFA_LINKUSERDATA_H_
diff --git a/xfa/fxfa/app/cxfa_loadercontext.cpp b/xfa/fxfa/cxfa_loadercontext.cpp
similarity index 92%
rename from xfa/fxfa/app/cxfa_loadercontext.cpp
rename to xfa/fxfa/cxfa_loadercontext.cpp
index 2ac58ba..05ba9f1 100644
--- a/xfa/fxfa/app/cxfa_loadercontext.cpp
+++ b/xfa/fxfa/cxfa_loadercontext.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxfa/app/cxfa_loadercontext.h"
+#include "xfa/fxfa/cxfa_loadercontext.h"
 
 CXFA_LoaderContext::CXFA_LoaderContext()
     : m_bSaveLineHeight(false),
diff --git a/xfa/fxfa/app/cxfa_loadercontext.h b/xfa/fxfa/cxfa_loadercontext.h
similarity index 86%
rename from xfa/fxfa/app/cxfa_loadercontext.h
rename to xfa/fxfa/cxfa_loadercontext.h
index 553252e..5bf8ed3 100644
--- a/xfa/fxfa/app/cxfa_loadercontext.h
+++ b/xfa/fxfa/cxfa_loadercontext.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXFA_APP_CXFA_LOADERCONTEXT_H_
-#define XFA_FXFA_APP_CXFA_LOADERCONTEXT_H_
+#ifndef XFA_FXFA_CXFA_LOADERCONTEXT_H_
+#define XFA_FXFA_CXFA_LOADERCONTEXT_H_
 
 #include <vector>
 
@@ -37,4 +37,4 @@
   std::vector<float> m_BlocksHeight;
 };
 
-#endif  // XFA_FXFA_APP_CXFA_LOADERCONTEXT_H_
+#endif  // XFA_FXFA_CXFA_LOADERCONTEXT_H_
diff --git a/xfa/fxfa/app/cxfa_pieceline.cpp b/xfa/fxfa/cxfa_pieceline.cpp
similarity index 79%
rename from xfa/fxfa/app/cxfa_pieceline.cpp
rename to xfa/fxfa/cxfa_pieceline.cpp
index 2e1ea55..6570ad5 100644
--- a/xfa/fxfa/app/cxfa_pieceline.cpp
+++ b/xfa/fxfa/cxfa_pieceline.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxfa/app/cxfa_pieceline.h"
+#include "xfa/fxfa/cxfa_pieceline.h"
 
-#include "xfa/fxfa/app/cxfa_textpiece.h"
+#include "xfa/fxfa/cxfa_textpiece.h"
 
 CXFA_PieceLine::CXFA_PieceLine() {}
 
diff --git a/xfa/fxfa/app/cxfa_pieceline.h b/xfa/fxfa/cxfa_pieceline.h
similarity index 80%
rename from xfa/fxfa/app/cxfa_pieceline.h
rename to xfa/fxfa/cxfa_pieceline.h
index 6b17ebf..82af0e5 100644
--- a/xfa/fxfa/app/cxfa_pieceline.h
+++ b/xfa/fxfa/cxfa_pieceline.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXFA_APP_CXFA_PIECELINE_H_
-#define XFA_FXFA_APP_CXFA_PIECELINE_H_
+#ifndef XFA_FXFA_CXFA_PIECELINE_H_
+#define XFA_FXFA_CXFA_PIECELINE_H_
 
 #include <memory>
 #include <vector>
@@ -23,4 +23,4 @@
   std::vector<int32_t> m_charCounts;
 };
 
-#endif  // XFA_FXFA_APP_CXFA_PIECELINE_H_
+#endif  // XFA_FXFA_CXFA_PIECELINE_H_
diff --git a/xfa/fxfa/app/cxfa_textlayout.cpp b/xfa/fxfa/cxfa_textlayout.cpp
similarity index 98%
rename from xfa/fxfa/app/cxfa_textlayout.cpp
rename to xfa/fxfa/cxfa_textlayout.cpp
index 489df9a..138587c 100644
--- a/xfa/fxfa/app/cxfa_textlayout.cpp
+++ b/xfa/fxfa/cxfa_textlayout.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxfa/app/cxfa_textlayout.h"
+#include "xfa/fxfa/cxfa_textlayout.h"
 
 #include <algorithm>
 #include <utility>
@@ -20,14 +20,14 @@
 #include "xfa/fde/cfde_renderdevice.h"
 #include "xfa/fde/css/cfde_csscomputedstyle.h"
 #include "xfa/fde/css/cfde_cssstyleselector.h"
-#include "xfa/fxfa/app/cxfa_linkuserdata.h"
-#include "xfa/fxfa/app/cxfa_loadercontext.h"
-#include "xfa/fxfa/app/cxfa_pieceline.h"
-#include "xfa/fxfa/app/cxfa_textparsecontext.h"
-#include "xfa/fxfa/app/cxfa_textpiece.h"
-#include "xfa/fxfa/app/cxfa_textprovider.h"
-#include "xfa/fxfa/app/cxfa_texttabstopscontext.h"
-#include "xfa/fxfa/app/cxfa_textuserdata.h"
+#include "xfa/fxfa/cxfa_linkuserdata.h"
+#include "xfa/fxfa/cxfa_loadercontext.h"
+#include "xfa/fxfa/cxfa_pieceline.h"
+#include "xfa/fxfa/cxfa_textparsecontext.h"
+#include "xfa/fxfa/cxfa_textpiece.h"
+#include "xfa/fxfa/cxfa_textprovider.h"
+#include "xfa/fxfa/cxfa_texttabstopscontext.h"
+#include "xfa/fxfa/cxfa_textuserdata.h"
 #include "xfa/fxfa/parser/cxfa_font.h"
 #include "xfa/fxfa/parser/cxfa_node.h"
 #include "xfa/fxfa/parser/cxfa_para.h"
diff --git a/xfa/fxfa/app/cxfa_textlayout.h b/xfa/fxfa/cxfa_textlayout.h
similarity index 96%
rename from xfa/fxfa/app/cxfa_textlayout.h
rename to xfa/fxfa/cxfa_textlayout.h
index e8c203f..079fff8 100644
--- a/xfa/fxfa/app/cxfa_textlayout.h
+++ b/xfa/fxfa/cxfa_textlayout.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXFA_APP_CXFA_TEXTLAYOUT_H_
-#define XFA_FXFA_APP_CXFA_TEXTLAYOUT_H_
+#ifndef XFA_FXFA_CXFA_TEXTLAYOUT_H_
+#define XFA_FXFA_CXFA_TEXTLAYOUT_H_
 
 #include <memory>
 #include <vector>
@@ -15,7 +15,7 @@
 #include "core/fxcrt/fx_string.h"
 #include "xfa/fde/css/fde_css.h"
 #include "xfa/fgas/layout/cfx_rtfbreak.h"
-#include "xfa/fxfa/app/cxfa_textparser.h"
+#include "xfa/fxfa/cxfa_textparser.h"
 
 class CFDE_Brush;
 class CFDE_CSSComputedStyle;
@@ -133,4 +133,4 @@
   bool m_bBlockContinue;
 };
 
-#endif  // XFA_FXFA_APP_CXFA_TEXTLAYOUT_H_
+#endif  // XFA_FXFA_CXFA_TEXTLAYOUT_H_
diff --git a/xfa/fxfa/app/cxfa_textparsecontext.cpp b/xfa/fxfa/cxfa_textparsecontext.cpp
similarity index 79%
rename from xfa/fxfa/app/cxfa_textparsecontext.cpp
rename to xfa/fxfa/cxfa_textparsecontext.cpp
index 851d844..7231f38 100644
--- a/xfa/fxfa/app/cxfa_textparsecontext.cpp
+++ b/xfa/fxfa/cxfa_textparsecontext.cpp
@@ -4,14 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxfa/app/cxfa_textparsecontext.h"
+#include "xfa/fxfa/cxfa_textparsecontext.h"
 
 #include "xfa/fde/css/cfde_csscomputedstyle.h"
 #include "xfa/fde/css/cfde_cssdeclaration.h"
 #include "xfa/fde/css/cfde_cssstyleselector.h"
 
 CXFA_TextParseContext::CXFA_TextParseContext()
-    : m_pParentStyle(nullptr),
-      m_eDisplay(FDE_CSSDisplay::None) {}
+    : m_pParentStyle(nullptr), m_eDisplay(FDE_CSSDisplay::None) {}
 
 CXFA_TextParseContext::~CXFA_TextParseContext() {}
diff --git a/xfa/fxfa/app/cxfa_textparsecontext.h b/xfa/fxfa/cxfa_textparsecontext.h
similarity index 87%
rename from xfa/fxfa/app/cxfa_textparsecontext.h
rename to xfa/fxfa/cxfa_textparsecontext.h
index 514d5d7..c323657 100644
--- a/xfa/fxfa/app/cxfa_textparsecontext.h
+++ b/xfa/fxfa/cxfa_textparsecontext.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXFA_APP_CXFA_TEXTPARSECONTEXT_H_
-#define XFA_FXFA_APP_CXFA_TEXTPARSECONTEXT_H_
+#ifndef XFA_FXFA_CXFA_TEXTPARSECONTEXT_H_
+#define XFA_FXFA_CXFA_TEXTPARSECONTEXT_H_
 
 #include <utility>
 #include <vector>
@@ -36,4 +36,4 @@
   FDE_CSSDisplay m_eDisplay;
 };
 
-#endif  // XFA_FXFA_APP_CXFA_TEXTPARSECONTEXT_H_
+#endif  // XFA_FXFA_CXFA_TEXTPARSECONTEXT_H_
diff --git a/xfa/fxfa/app/cxfa_textparser.cpp b/xfa/fxfa/cxfa_textparser.cpp
similarity index 98%
rename from xfa/fxfa/app/cxfa_textparser.cpp
rename to xfa/fxfa/cxfa_textparser.cpp
index 8bdb0a8..2bc0096 100644
--- a/xfa/fxfa/app/cxfa_textparser.cpp
+++ b/xfa/fxfa/cxfa_textparser.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxfa/app/cxfa_textparser.h"
+#include "xfa/fxfa/cxfa_textparser.h"
 
 #include <algorithm>
 #include <utility>
@@ -19,13 +19,13 @@
 #include "xfa/fde/css/cfde_cssstylesheet.h"
 #include "xfa/fde/css/fde_css.h"
 #include "xfa/fgas/font/cfgas_fontmgr.h"
-#include "xfa/fxfa/app/cxfa_csstagprovider.h"
-#include "xfa/fxfa/app/cxfa_textparsecontext.h"
-#include "xfa/fxfa/app/cxfa_textprovider.h"
-#include "xfa/fxfa/app/cxfa_texttabstopscontext.h"
+#include "xfa/fxfa/cxfa_csstagprovider.h"
 #include "xfa/fxfa/cxfa_ffapp.h"
 #include "xfa/fxfa/cxfa_ffdoc.h"
 #include "xfa/fxfa/cxfa_fontmgr.h"
+#include "xfa/fxfa/cxfa_textparsecontext.h"
+#include "xfa/fxfa/cxfa_textprovider.h"
+#include "xfa/fxfa/cxfa_texttabstopscontext.h"
 #include "xfa/fxfa/parser/cxfa_measurement.h"
 
 namespace {
diff --git a/xfa/fxfa/app/cxfa_textparser.h b/xfa/fxfa/cxfa_textparser.h
similarity index 96%
rename from xfa/fxfa/app/cxfa_textparser.h
rename to xfa/fxfa/cxfa_textparser.h
index 04bd51f..3c1b603 100644
--- a/xfa/fxfa/app/cxfa_textparser.h
+++ b/xfa/fxfa/cxfa_textparser.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXFA_APP_CXFA_TEXTPARSER_H_
-#define XFA_FXFA_APP_CXFA_TEXTPARSER_H_
+#ifndef XFA_FXFA_CXFA_TEXTPARSER_H_
+#define XFA_FXFA_CXFA_TEXTPARSER_H_
 
 #include <map>
 #include <memory>
@@ -101,4 +101,4 @@
       m_mapXMLNodeToParseContext;
 };
 
-#endif  // XFA_FXFA_APP_CXFA_TEXTPARSER_H_
+#endif  // XFA_FXFA_CXFA_TEXTPARSER_H_
diff --git a/xfa/fxfa/app/cxfa_textparser_unittest.cpp b/xfa/fxfa/cxfa_textparser_unittest.cpp
similarity index 96%
rename from xfa/fxfa/app/cxfa_textparser_unittest.cpp
rename to xfa/fxfa/cxfa_textparser_unittest.cpp
index 82a0110..bd748cd 100644
--- a/xfa/fxfa/app/cxfa_textparser_unittest.cpp
+++ b/xfa/fxfa/cxfa_textparser_unittest.cpp
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "xfa/fxfa/app/cxfa_textparser.h"
+#include "xfa/fxfa/cxfa_textparser.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/xfa/fxfa/app/cxfa_textpiece.cpp b/xfa/fxfa/cxfa_textpiece.cpp
similarity index 78%
rename from xfa/fxfa/app/cxfa_textpiece.cpp
rename to xfa/fxfa/cxfa_textpiece.cpp
index 4cbad0a..87a5e3f 100644
--- a/xfa/fxfa/app/cxfa_textpiece.cpp
+++ b/xfa/fxfa/cxfa_textpiece.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxfa/app/cxfa_textpiece.h"
+#include "xfa/fxfa/cxfa_textpiece.h"
 
-#include "xfa/fxfa/app/cxfa_linkuserdata.h"
+#include "xfa/fxfa/cxfa_linkuserdata.h"
 
 CXFA_TextPiece::CXFA_TextPiece() {}
 
diff --git a/xfa/fxfa/app/cxfa_textpiece.h b/xfa/fxfa/cxfa_textpiece.h
similarity index 87%
rename from xfa/fxfa/app/cxfa_textpiece.h
rename to xfa/fxfa/cxfa_textpiece.h
index 0fba66e..453257d 100644
--- a/xfa/fxfa/app/cxfa_textpiece.h
+++ b/xfa/fxfa/cxfa_textpiece.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXFA_APP_CXFA_TEXTPIECE_H_
-#define XFA_FXFA_APP_CXFA_TEXTPIECE_H_
+#ifndef XFA_FXFA_CXFA_TEXTPIECE_H_
+#define XFA_FXFA_CXFA_TEXTPIECE_H_
 
 #include <vector>
 
@@ -38,4 +38,4 @@
   CFX_RetainPtr<CXFA_LinkUserData> pLinkData;
 };
 
-#endif  // XFA_FXFA_APP_CXFA_TEXTPIECE_H_
+#endif  // XFA_FXFA_CXFA_TEXTPIECE_H_
diff --git a/xfa/fxfa/app/cxfa_textprovider.cpp b/xfa/fxfa/cxfa_textprovider.cpp
similarity index 96%
rename from xfa/fxfa/app/cxfa_textprovider.cpp
rename to xfa/fxfa/cxfa_textprovider.cpp
index 01bc021..16a2b58 100644
--- a/xfa/fxfa/app/cxfa_textprovider.cpp
+++ b/xfa/fxfa/cxfa_textprovider.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxfa/app/cxfa_textprovider.h"
+#include "xfa/fxfa/cxfa_textprovider.h"
 
 #include <algorithm>
 #include <memory>
@@ -16,16 +16,16 @@
 #include "third_party/base/ptr_util.h"
 #include "third_party/base/stl_util.h"
 #include "xfa/fde/cfde_textout.h"
-#include "xfa/fxfa/app/cxfa_ffcheckbutton.h"
-#include "xfa/fxfa/app/cxfa_fffield.h"
-#include "xfa/fxfa/app/cxfa_fwladapterwidgetmgr.h"
 #include "xfa/fxfa/cxfa_eventparam.h"
 #include "xfa/fxfa/cxfa_ffapp.h"
+#include "xfa/fxfa/cxfa_ffcheckbutton.h"
 #include "xfa/fxfa/cxfa_ffdoc.h"
 #include "xfa/fxfa/cxfa_ffdocview.h"
+#include "xfa/fxfa/cxfa_fffield.h"
 #include "xfa/fxfa/cxfa_ffpageview.h"
 #include "xfa/fxfa/cxfa_ffwidget.h"
 #include "xfa/fxfa/cxfa_fontmgr.h"
+#include "xfa/fxfa/cxfa_fwladapterwidgetmgr.h"
 #include "xfa/fxfa/parser/cxfa_layoutprocessor.h"
 #include "xfa/fxfa/parser/cxfa_localevalue.h"
 #include "xfa/fxfa/parser/cxfa_node.h"
diff --git a/xfa/fxfa/app/cxfa_textprovider.h b/xfa/fxfa/cxfa_textprovider.h
similarity index 87%
rename from xfa/fxfa/app/cxfa_textprovider.h
rename to xfa/fxfa/cxfa_textprovider.h
index 08fc6f3..0772490 100644
--- a/xfa/fxfa/app/cxfa_textprovider.h
+++ b/xfa/fxfa/cxfa_textprovider.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXFA_APP_CXFA_TEXTPROVIDER_H_
-#define XFA_FXFA_APP_CXFA_TEXTPROVIDER_H_
+#ifndef XFA_FXFA_CXFA_TEXTPROVIDER_H_
+#define XFA_FXFA_CXFA_TEXTPROVIDER_H_
 
 #include "core/fxcrt/fx_string.h"
-#include "xfa/fxfa/app/cxfa_textlayout.h"
+#include "xfa/fxfa/cxfa_textlayout.h"
 #include "xfa/fxfa/cxfa_widgetacc.h"
 #include "xfa/fxfa/parser/cxfa_font.h"
 #include "xfa/fxfa/parser/cxfa_para.h"
@@ -47,4 +47,4 @@
   XFA_TEXTPROVIDERTYPE m_eType;
 };
 
-#endif  // XFA_FXFA_APP_CXFA_TEXTPROVIDER_H_
+#endif  // XFA_FXFA_CXFA_TEXTPROVIDER_H_
diff --git a/xfa/fxfa/app/cxfa_texttabstopscontext.cpp b/xfa/fxfa/cxfa_texttabstopscontext.cpp
similarity index 94%
rename from xfa/fxfa/app/cxfa_texttabstopscontext.cpp
rename to xfa/fxfa/cxfa_texttabstopscontext.cpp
index 58ceb21..39476f7 100644
--- a/xfa/fxfa/app/cxfa_texttabstopscontext.cpp
+++ b/xfa/fxfa/cxfa_texttabstopscontext.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxfa/app/cxfa_texttabstopscontext.h"
+#include "xfa/fxfa/cxfa_texttabstopscontext.h"
 
 CXFA_TextTabstopsContext::CXFA_TextTabstopsContext()
     : m_iTabIndex(-1), m_bTabstops(false), m_fTabWidth(0), m_fLeft(0) {}
diff --git a/xfa/fxfa/app/cxfa_texttabstopscontext.h b/xfa/fxfa/cxfa_texttabstopscontext.h
similarity index 83%
rename from xfa/fxfa/app/cxfa_texttabstopscontext.h
rename to xfa/fxfa/cxfa_texttabstopscontext.h
index 9be10dd..7124fd8 100644
--- a/xfa/fxfa/app/cxfa_texttabstopscontext.h
+++ b/xfa/fxfa/cxfa_texttabstopscontext.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXFA_APP_CXFA_TEXTTABSTOPSCONTEXT_H_
-#define XFA_FXFA_APP_CXFA_TEXTTABSTOPSCONTEXT_H_
+#ifndef XFA_FXFA_CXFA_TEXTTABSTOPSCONTEXT_H_
+#define XFA_FXFA_CXFA_TEXTTABSTOPSCONTEXT_H_
 
 #include <vector>
 
@@ -36,4 +36,4 @@
   std::vector<XFA_TABSTOPS> m_tabstops;
 };
 
-#endif  // XFA_FXFA_APP_CXFA_TEXTTABSTOPSCONTEXT_H_
+#endif  // XFA_FXFA_CXFA_TEXTTABSTOPSCONTEXT_H_
diff --git a/xfa/fxfa/app/cxfa_textuserdata.cpp b/xfa/fxfa/cxfa_textuserdata.cpp
similarity index 89%
rename from xfa/fxfa/app/cxfa_textuserdata.cpp
rename to xfa/fxfa/cxfa_textuserdata.cpp
index e4e5493..4cec6b3 100644
--- a/xfa/fxfa/app/cxfa_textuserdata.cpp
+++ b/xfa/fxfa/cxfa_textuserdata.cpp
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxfa/app/cxfa_textuserdata.h"
+#include "xfa/fxfa/cxfa_textuserdata.h"
 
 #include "xfa/fde/css/cfde_csscomputedstyle.h"
 #include "xfa/fde/css/cfde_cssstyleselector.h"
 #include "xfa/fde/css/fde_css.h"
-#include "xfa/fxfa/app/cxfa_linkuserdata.h"
+#include "xfa/fxfa/cxfa_linkuserdata.h"
 
 CXFA_TextUserData::CXFA_TextUserData(
     const CFX_RetainPtr<CFDE_CSSComputedStyle>& pStyle)
diff --git a/xfa/fxfa/app/cxfa_textuserdata.h b/xfa/fxfa/cxfa_textuserdata.h
similarity index 87%
rename from xfa/fxfa/app/cxfa_textuserdata.h
rename to xfa/fxfa/cxfa_textuserdata.h
index 18a20cd..c9e90aa 100644
--- a/xfa/fxfa/app/cxfa_textuserdata.h
+++ b/xfa/fxfa/cxfa_textuserdata.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXFA_APP_CXFA_TEXTUSERDATA_H_
-#define XFA_FXFA_APP_CXFA_TEXTUSERDATA_H_
+#ifndef XFA_FXFA_CXFA_TEXTUSERDATA_H_
+#define XFA_FXFA_CXFA_TEXTUSERDATA_H_
 
 #include "core/fxcrt/cfx_retain_ptr.h"
 #include "core/fxcrt/fx_basic.h"
@@ -29,4 +29,4 @@
   ~CXFA_TextUserData() override;
 };
 
-#endif  // XFA_FXFA_APP_CXFA_TEXTUSERDATA_H_
+#endif  // XFA_FXFA_CXFA_TEXTUSERDATA_H_
diff --git a/xfa/fxfa/cxfa_widgetacc.cpp b/xfa/fxfa/cxfa_widgetacc.cpp
index 3c136df..0ed941f 100644
--- a/xfa/fxfa/cxfa_widgetacc.cpp
+++ b/xfa/fxfa/cxfa_widgetacc.cpp
@@ -13,13 +13,13 @@
 #include "core/fxcrt/xml/cfx_xmlnode.h"
 #include "third_party/base/stl_util.h"
 #include "xfa/fde/cfde_textout.h"
-#include "xfa/fxfa/app/cxfa_textlayout.h"
-#include "xfa/fxfa/app/cxfa_textprovider.h"
 #include "xfa/fxfa/cxfa_ffapp.h"
 #include "xfa/fxfa/cxfa_ffdoc.h"
 #include "xfa/fxfa/cxfa_ffdocview.h"
 #include "xfa/fxfa/cxfa_ffwidget.h"
 #include "xfa/fxfa/cxfa_fontmgr.h"
+#include "xfa/fxfa/cxfa_textlayout.h"
+#include "xfa/fxfa/cxfa_textprovider.h"
 #include "xfa/fxfa/parser/cxfa_layoutprocessor.h"
 #include "xfa/fxfa/parser/cxfa_localevalue.h"
 #include "xfa/fxfa/parser/cxfa_node.h"
diff --git a/xfa/fxfa/fm2js/cxfa_fm2jscontext.cpp b/xfa/fxfa/fm2js/cxfa_fm2jscontext.cpp
index 5f1a4d2..bea1f32 100644
--- a/xfa/fxfa/fm2js/cxfa_fm2jscontext.cpp
+++ b/xfa/fxfa/fm2js/cxfa_fm2jscontext.cpp
@@ -17,7 +17,7 @@
 #include "fxjs/cfxjse_value.h"
 #include "third_party/base/ptr_util.h"
 #include "third_party/base/stl_util.h"
-#include "xfa/fxfa/app/cxfa_ffnotify.h"
+#include "xfa/fxfa/cxfa_ffnotify.h"
 #include "xfa/fxfa/fm2js/cxfa_fmparse.h"
 #include "xfa/fxfa/parser/cxfa_document.h"
 #include "xfa/fxfa/parser/cxfa_localevalue.h"
diff --git a/xfa/fxfa/parser/cscript_eventpseudomodel.cpp b/xfa/fxfa/parser/cscript_eventpseudomodel.cpp
index ede5987..45f1171 100644
--- a/xfa/fxfa/parser/cscript_eventpseudomodel.cpp
+++ b/xfa/fxfa/parser/cscript_eventpseudomodel.cpp
@@ -7,8 +7,8 @@
 #include "xfa/fxfa/parser/cscript_eventpseudomodel.h"
 
 #include "fxjs/cfxjse_arguments.h"
-#include "xfa/fxfa/app/cxfa_ffnotify.h"
 #include "xfa/fxfa/cxfa_eventparam.h"
+#include "xfa/fxfa/cxfa_ffnotify.h"
 #include "xfa/fxfa/cxfa_ffwidgethandler.h"
 #include "xfa/fxfa/parser/cxfa_document.h"
 #include "xfa/fxfa/parser/cxfa_localemgr.h"
diff --git a/xfa/fxfa/parser/cscript_hostpseudomodel.cpp b/xfa/fxfa/parser/cscript_hostpseudomodel.cpp
index d9eb5d6..2db6677 100644
--- a/xfa/fxfa/parser/cscript_hostpseudomodel.cpp
+++ b/xfa/fxfa/parser/cscript_hostpseudomodel.cpp
@@ -9,7 +9,7 @@
 #include <memory>
 
 #include "fxjs/cfxjse_arguments.h"
-#include "xfa/fxfa/app/cxfa_ffnotify.h"
+#include "xfa/fxfa/cxfa_ffnotify.h"
 #include "xfa/fxfa/parser/cxfa_document.h"
 #include "xfa/fxfa/parser/cxfa_layoutprocessor.h"
 #include "xfa/fxfa/parser/cxfa_localemgr.h"
diff --git a/xfa/fxfa/parser/cscript_layoutpseudomodel.cpp b/xfa/fxfa/parser/cscript_layoutpseudomodel.cpp
index 130c9f0..8eeb0ff 100644
--- a/xfa/fxfa/parser/cscript_layoutpseudomodel.cpp
+++ b/xfa/fxfa/parser/cscript_layoutpseudomodel.cpp
@@ -10,7 +10,7 @@
 
 #include "fxjs/cfxjse_arguments.h"
 #include "third_party/base/stl_util.h"
-#include "xfa/fxfa/app/cxfa_ffnotify.h"
+#include "xfa/fxfa/cxfa_ffnotify.h"
 #include "xfa/fxfa/parser/cxfa_arraynodelist.h"
 #include "xfa/fxfa/parser/cxfa_containerlayoutitem.h"
 #include "xfa/fxfa/parser/cxfa_contentlayoutitem.h"
diff --git a/xfa/fxfa/parser/cscript_signaturepseudomodel.cpp b/xfa/fxfa/parser/cscript_signaturepseudomodel.cpp
index 023d3e5..c746a4e 100644
--- a/xfa/fxfa/parser/cscript_signaturepseudomodel.cpp
+++ b/xfa/fxfa/parser/cscript_signaturepseudomodel.cpp
@@ -7,7 +7,7 @@
 #include "xfa/fxfa/parser/cscript_signaturepseudomodel.h"
 
 #include "fxjs/cfxjse_arguments.h"
-#include "xfa/fxfa/app/cxfa_ffnotify.h"
+#include "xfa/fxfa/cxfa_ffnotify.h"
 #include "xfa/fxfa/parser/cxfa_document.h"
 #include "xfa/fxfa/parser/cxfa_localemgr.h"
 #include "xfa/fxfa/parser/cxfa_scriptcontext.h"
diff --git a/xfa/fxfa/parser/cxfa_document.cpp b/xfa/fxfa/parser/cxfa_document.cpp
index ec80866..16b999b 100644
--- a/xfa/fxfa/parser/cxfa_document.cpp
+++ b/xfa/fxfa/parser/cxfa_document.cpp
@@ -7,7 +7,7 @@
 #include "xfa/fxfa/parser/cxfa_document.h"
 
 #include "core/fxcrt/fx_extension.h"
-#include "xfa/fxfa/app/cxfa_ffnotify.h"
+#include "xfa/fxfa/cxfa_ffnotify.h"
 #include "xfa/fxfa/parser/cscript_datawindow.h"
 #include "xfa/fxfa/parser/cscript_eventpseudomodel.h"
 #include "xfa/fxfa/parser/cscript_hostpseudomodel.h"
diff --git a/xfa/fxfa/parser/cxfa_itemlayoutprocessor.cpp b/xfa/fxfa/parser/cxfa_itemlayoutprocessor.cpp
index 694b24d..f7a019d 100644
--- a/xfa/fxfa/parser/cxfa_itemlayoutprocessor.cpp
+++ b/xfa/fxfa/parser/cxfa_itemlayoutprocessor.cpp
@@ -14,7 +14,7 @@
 #include "third_party/base/logging.h"
 #include "third_party/base/ptr_util.h"
 #include "third_party/base/stl_util.h"
-#include "xfa/fxfa/app/cxfa_ffnotify.h"
+#include "xfa/fxfa/cxfa_ffnotify.h"
 #include "xfa/fxfa/parser/cxfa_containerlayoutitem.h"
 #include "xfa/fxfa/parser/cxfa_contentlayoutitem.h"
 #include "xfa/fxfa/parser/cxfa_document.h"
diff --git a/xfa/fxfa/parser/cxfa_layoutitem.cpp b/xfa/fxfa/parser/cxfa_layoutitem.cpp
index a769da0..a670d30 100644
--- a/xfa/fxfa/parser/cxfa_layoutitem.cpp
+++ b/xfa/fxfa/parser/cxfa_layoutitem.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/fxfa/parser/cxfa_layoutitem.h"
 
-#include "xfa/fxfa/app/cxfa_ffnotify.h"
+#include "xfa/fxfa/cxfa_ffnotify.h"
 #include "xfa/fxfa/parser/cxfa_containerlayoutitem.h"
 #include "xfa/fxfa/parser/cxfa_contentlayoutitem.h"
 #include "xfa/fxfa/parser/cxfa_measurement.h"
diff --git a/xfa/fxfa/parser/cxfa_layoutpagemgr.cpp b/xfa/fxfa/parser/cxfa_layoutpagemgr.cpp
index 0bf091e..a3f4ce9 100644
--- a/xfa/fxfa/parser/cxfa_layoutpagemgr.cpp
+++ b/xfa/fxfa/parser/cxfa_layoutpagemgr.cpp
@@ -7,7 +7,7 @@
 #include "xfa/fxfa/parser/cxfa_layoutpagemgr.h"
 
 #include "third_party/base/stl_util.h"
-#include "xfa/fxfa/app/cxfa_ffnotify.h"
+#include "xfa/fxfa/cxfa_ffnotify.h"
 #include "xfa/fxfa/parser/cxfa_containerlayoutitem.h"
 #include "xfa/fxfa/parser/cxfa_contentlayoutitem.h"
 #include "xfa/fxfa/parser/cxfa_document.h"
diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp
index 5c4f8d1..11c2c3c 100644
--- a/xfa/fxfa/parser/cxfa_node.cpp
+++ b/xfa/fxfa/parser/cxfa_node.cpp
@@ -23,8 +23,8 @@
 #include "third_party/base/logging.h"
 #include "third_party/base/ptr_util.h"
 #include "third_party/base/stl_util.h"
-#include "xfa/fxfa/app/cxfa_ffnotify.h"
 #include "xfa/fxfa/cxfa_eventparam.h"
+#include "xfa/fxfa/cxfa_ffnotify.h"
 #include "xfa/fxfa/cxfa_ffwidget.h"
 #include "xfa/fxfa/parser/cxfa_arraynodelist.h"
 #include "xfa/fxfa/parser/cxfa_attachnodelist.h"
diff --git a/xfa/fxfa/parser/cxfa_object.cpp b/xfa/fxfa/parser/cxfa_object.cpp
index 32aed5d..8ebedf9 100644
--- a/xfa/fxfa/parser/cxfa_object.cpp
+++ b/xfa/fxfa/parser/cxfa_object.cpp
@@ -8,7 +8,7 @@
 
 #include "core/fxcrt/fx_extension.h"
 #include "fxjs/cfxjse_value.h"
-#include "xfa/fxfa/app/cxfa_ffnotify.h"
+#include "xfa/fxfa/cxfa_ffnotify.h"
 #include "xfa/fxfa/parser/cxfa_document.h"
 #include "xfa/fxfa/parser/cxfa_node.h"
 #include "xfa/fxfa/parser/cxfa_nodelist.h"
diff --git a/xfa/fxfa/parser/cxfa_scriptcontext.cpp b/xfa/fxfa/parser/cxfa_scriptcontext.cpp
index fcf2244..115cd56 100644
--- a/xfa/fxfa/parser/cxfa_scriptcontext.cpp
+++ b/xfa/fxfa/parser/cxfa_scriptcontext.cpp
@@ -14,8 +14,8 @@
 #include "fxjs/cfxjse_value.h"
 #include "third_party/base/ptr_util.h"
 #include "third_party/base/stl_util.h"
-#include "xfa/fxfa/app/cxfa_ffnotify.h"
 #include "xfa/fxfa/cxfa_eventparam.h"
+#include "xfa/fxfa/cxfa_ffnotify.h"
 #include "xfa/fxfa/parser/cxfa_document.h"
 #include "xfa/fxfa/parser/cxfa_localemgr.h"
 #include "xfa/fxfa/parser/cxfa_node.h"
diff --git a/xfa/fxfa/parser/cxfa_widgetdata.cpp b/xfa/fxfa/parser/cxfa_widgetdata.cpp
index cd4aa57..cbe0d14 100644
--- a/xfa/fxfa/parser/cxfa_widgetdata.cpp
+++ b/xfa/fxfa/parser/cxfa_widgetdata.cpp
@@ -10,7 +10,7 @@
 #include "core/fxcrt/fx_extension.h"
 #include "fxbarcode/BC_Library.h"
 #include "third_party/base/stl_util.h"
-#include "xfa/fxfa/app/cxfa_ffnotify.h"
+#include "xfa/fxfa/cxfa_ffnotify.h"
 #include "xfa/fxfa/parser/cxfa_document.h"
 #include "xfa/fxfa/parser/cxfa_event.h"
 #include "xfa/fxfa/parser/cxfa_localevalue.h"