diff --git a/BUILD.gn b/BUILD.gn
index 2f3bd9a..1af2c28 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1153,14 +1153,34 @@
       "xfa/fgas/localization/fgas_locale.cpp",
       "xfa/fgas/localization/fgas_locale.h",
       "xfa/fgas/localization/fgas_localeimp.h",
+      "xfa/fwl/core/cfwl_barcode.cpp",
+      "xfa/fwl/core/cfwl_barcode.h",
+      "xfa/fwl/core/cfwl_checkbox.cpp",
+      "xfa/fwl/core/cfwl_checkbox.h",
+      "xfa/fwl/core/cfwl_combobox.cpp",
+      "xfa/fwl/core/cfwl_combobox.h",
+      "xfa/fwl/core/cfwl_datetimepicker.cpp",
+      "xfa/fwl/core/cfwl_datetimepicker.h",
+      "xfa/fwl/core/cfwl_edit.cpp",
+      "xfa/fwl/core/cfwl_edit.h",
       "xfa/fwl/core/cfwl_event.h",
+      "xfa/fwl/core/cfwl_listbox.cpp",
+      "xfa/fwl/core/cfwl_listbox.h",
       "xfa/fwl/core/cfwl_message.h",
+      "xfa/fwl/core/cfwl_picturebox.cpp",
+      "xfa/fwl/core/cfwl_picturebox.h",
+      "xfa/fwl/core/cfwl_pushbutton.cpp",
+      "xfa/fwl/core/cfwl_pushbutton.h",
       "xfa/fwl/core/cfwl_themebackground.h",
       "xfa/fwl/core/cfwl_themepart.h",
       "xfa/fwl/core/cfwl_themetext.h",
+      "xfa/fwl/core/cfwl_widget.cpp",
+      "xfa/fwl/core/cfwl_widget.h",
       "xfa/fwl/core/cfwl_widgetimpproperties.h",
       "xfa/fwl/core/cfwl_widgetmgr.cpp",
       "xfa/fwl/core/cfwl_widgetmgr.h",
+      "xfa/fwl/core/cfwl_widgetproperties.cpp",
+      "xfa/fwl/core/cfwl_widgetproperties.h",
       "xfa/fwl/core/cfx_barcode.cpp",
       "xfa/fwl/core/cfx_barcode.h",
       "xfa/fwl/core/fwl_error.h",
@@ -1216,26 +1236,6 @@
       "xfa/fwl/core/ifwl_widget.cpp",
       "xfa/fwl/core/ifwl_widget.h",
       "xfa/fwl/core/ifwl_widgetdelegate.h",
-      "xfa/fwl/lightwidget/cfwl_barcode.cpp",
-      "xfa/fwl/lightwidget/cfwl_barcode.h",
-      "xfa/fwl/lightwidget/cfwl_checkbox.cpp",
-      "xfa/fwl/lightwidget/cfwl_checkbox.h",
-      "xfa/fwl/lightwidget/cfwl_combobox.cpp",
-      "xfa/fwl/lightwidget/cfwl_combobox.h",
-      "xfa/fwl/lightwidget/cfwl_datetimepicker.cpp",
-      "xfa/fwl/lightwidget/cfwl_datetimepicker.h",
-      "xfa/fwl/lightwidget/cfwl_edit.cpp",
-      "xfa/fwl/lightwidget/cfwl_edit.h",
-      "xfa/fwl/lightwidget/cfwl_listbox.cpp",
-      "xfa/fwl/lightwidget/cfwl_listbox.h",
-      "xfa/fwl/lightwidget/cfwl_picturebox.cpp",
-      "xfa/fwl/lightwidget/cfwl_picturebox.h",
-      "xfa/fwl/lightwidget/cfwl_pushbutton.cpp",
-      "xfa/fwl/lightwidget/cfwl_pushbutton.h",
-      "xfa/fwl/lightwidget/cfwl_widget.cpp",
-      "xfa/fwl/lightwidget/cfwl_widget.h",
-      "xfa/fwl/lightwidget/cfwl_widgetproperties.cpp",
-      "xfa/fwl/lightwidget/cfwl_widgetproperties.h",
       "xfa/fwl/theme/cfwl_arrowdata.cpp",
       "xfa/fwl/theme/cfwl_arrowdata.h",
       "xfa/fwl/theme/cfwl_barcodetp.cpp",
diff --git a/xfa/fwl/lightwidget/cfwl_barcode.cpp b/xfa/fwl/core/cfwl_barcode.cpp
similarity index 97%
rename from xfa/fwl/lightwidget/cfwl_barcode.cpp
rename to xfa/fwl/core/cfwl_barcode.cpp
index c26d719..67cbc30 100644
--- a/xfa/fwl/lightwidget/cfwl_barcode.cpp
+++ b/xfa/fwl/core/cfwl_barcode.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/lightwidget/cfwl_barcode.h"
+#include "xfa/fwl/core/cfwl_barcode.h"
 
 #include <memory>
 
diff --git a/xfa/fwl/lightwidget/cfwl_barcode.h b/xfa/fwl/core/cfwl_barcode.h
similarity index 95%
rename from xfa/fwl/lightwidget/cfwl_barcode.h
rename to xfa/fwl/core/cfwl_barcode.h
index 4bb3d60..3900667 100644
--- a/xfa/fwl/lightwidget/cfwl_barcode.h
+++ b/xfa/fwl/core/cfwl_barcode.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_LIGHTWIDGET_CFWL_BARCODE_H_
-#define XFA_FWL_LIGHTWIDGET_CFWL_BARCODE_H_
+#ifndef XFA_FWL_CORE_CFWL_BARCODE_H_
+#define XFA_FWL_CORE_CFWL_BARCODE_H_
 
+#include "xfa/fwl/core/cfwl_edit.h"
 #include "xfa/fwl/core/fwl_error.h"
 #include "xfa/fwl/core/ifwl_barcode.h"
-#include "xfa/fwl/lightwidget/cfwl_edit.h"
 
 class CFWL_Widget;
 class CFWL_WidgetProperties;
@@ -125,4 +125,4 @@
   CFWL_BarcodeDP m_barcodeData;
 };
 
-#endif  // XFA_FWL_LIGHTWIDGET_CFWL_BARCODE_H_
+#endif  // XFA_FWL_CORE_CFWL_BARCODE_H_
diff --git a/xfa/fwl/lightwidget/cfwl_checkbox.cpp b/xfa/fwl/core/cfwl_checkbox.cpp
similarity index 97%
rename from xfa/fwl/lightwidget/cfwl_checkbox.cpp
rename to xfa/fwl/core/cfwl_checkbox.cpp
index aeaf3f5..bc55a69 100644
--- a/xfa/fwl/lightwidget/cfwl_checkbox.cpp
+++ b/xfa/fwl/core/cfwl_checkbox.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/lightwidget/cfwl_checkbox.h"
+#include "xfa/fwl/core/cfwl_checkbox.h"
 
 #include <memory>
 
diff --git a/xfa/fwl/lightwidget/cfwl_checkbox.h b/xfa/fwl/core/cfwl_checkbox.h
similarity index 85%
rename from xfa/fwl/lightwidget/cfwl_checkbox.h
rename to xfa/fwl/core/cfwl_checkbox.h
index 343970c..9daab33 100644
--- a/xfa/fwl/lightwidget/cfwl_checkbox.h
+++ b/xfa/fwl/core/cfwl_checkbox.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_LIGHTWIDGET_CFWL_CHECKBOX_H_
-#define XFA_FWL_LIGHTWIDGET_CFWL_CHECKBOX_H_
+#ifndef XFA_FWL_CORE_CFWL_CHECKBOX_H_
+#define XFA_FWL_CORE_CFWL_CHECKBOX_H_
 
+#include "xfa/fwl/core/cfwl_widget.h"
 #include "xfa/fwl/core/ifwl_checkbox.h"
-#include "xfa/fwl/lightwidget/cfwl_widget.h"
 
 class CFWL_CheckBox : public CFWL_Widget {
  public:
@@ -43,4 +43,4 @@
   CFWL_CheckBoxDP m_checkboxData;
 };
 
-#endif  // XFA_FWL_LIGHTWIDGET_CFWL_CHECKBOX_H_
+#endif  // XFA_FWL_CORE_CFWL_CHECKBOX_H_
diff --git a/xfa/fwl/lightwidget/cfwl_combobox.cpp b/xfa/fwl/core/cfwl_combobox.cpp
similarity index 99%
rename from xfa/fwl/lightwidget/cfwl_combobox.cpp
rename to xfa/fwl/core/cfwl_combobox.cpp
index a56b875..e00f785 100644
--- a/xfa/fwl/lightwidget/cfwl_combobox.cpp
+++ b/xfa/fwl/core/cfwl_combobox.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/lightwidget/cfwl_combobox.h"
+#include "xfa/fwl/core/cfwl_combobox.h"
 
 #include <utility>
 
diff --git a/xfa/fwl/lightwidget/cfwl_combobox.h b/xfa/fwl/core/cfwl_combobox.h
similarity index 96%
rename from xfa/fwl/lightwidget/cfwl_combobox.h
rename to xfa/fwl/core/cfwl_combobox.h
index b6dee57..6e4988f 100644
--- a/xfa/fwl/lightwidget/cfwl_combobox.h
+++ b/xfa/fwl/core/cfwl_combobox.h
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_LIGHTWIDGET_CFWL_COMBOBOX_H_
-#define XFA_FWL_LIGHTWIDGET_CFWL_COMBOBOX_H_
+#ifndef XFA_FWL_CORE_CFWL_COMBOBOX_H_
+#define XFA_FWL_CORE_CFWL_COMBOBOX_H_
 
 #include <memory>
 #include <vector>
 
+#include "xfa/fwl/core/cfwl_widget.h"
 #include "xfa/fwl/core/ifwl_combobox.h"
-#include "xfa/fwl/lightwidget/cfwl_widget.h"
 
 class CFWL_WidgetProperties;
 class IFWL_ComboBoxDP;
@@ -145,4 +145,4 @@
   void* m_pData;
 };
 
-#endif  // XFA_FWL_LIGHTWIDGET_CFWL_COMBOBOX_H_
+#endif  // XFA_FWL_CORE_CFWL_COMBOBOX_H_
diff --git a/xfa/fwl/lightwidget/cfwl_datetimepicker.cpp b/xfa/fwl/core/cfwl_datetimepicker.cpp
similarity index 98%
rename from xfa/fwl/lightwidget/cfwl_datetimepicker.cpp
rename to xfa/fwl/core/cfwl_datetimepicker.cpp
index be59564..7d5a153 100644
--- a/xfa/fwl/lightwidget/cfwl_datetimepicker.cpp
+++ b/xfa/fwl/core/cfwl_datetimepicker.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/lightwidget/cfwl_datetimepicker.h"
+#include "xfa/fwl/core/cfwl_datetimepicker.h"
 
 #include <memory>
 
diff --git a/xfa/fwl/lightwidget/cfwl_datetimepicker.h b/xfa/fwl/core/cfwl_datetimepicker.h
similarity index 91%
rename from xfa/fwl/lightwidget/cfwl_datetimepicker.h
rename to xfa/fwl/core/cfwl_datetimepicker.h
index 3099884..a3299a9 100644
--- a/xfa/fwl/lightwidget/cfwl_datetimepicker.h
+++ b/xfa/fwl/core/cfwl_datetimepicker.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_LIGHTWIDGET_CFWL_DATETIMEPICKER_H_
-#define XFA_FWL_LIGHTWIDGET_CFWL_DATETIMEPICKER_H_
+#ifndef XFA_FWL_CORE_CFWL_DATETIMEPICKER_H_
+#define XFA_FWL_CORE_CFWL_DATETIMEPICKER_H_
 
+#include "xfa/fwl/core/cfwl_widget.h"
 #include "xfa/fwl/core/ifwl_datetimepicker.h"
-#include "xfa/fwl/lightwidget/cfwl_widget.h"
 
 class CFWL_DateTimePicker : public CFWL_Widget {
  public:
@@ -67,4 +67,4 @@
   CFWL_DateTimePickerDP m_DateTimePickerDP;
 };
 
-#endif  // XFA_FWL_LIGHTWIDGET_CFWL_DATETIMEPICKER_H_
+#endif  // XFA_FWL_CORE_CFWL_DATETIMEPICKER_H_
diff --git a/xfa/fwl/lightwidget/cfwl_edit.cpp b/xfa/fwl/core/cfwl_edit.cpp
similarity index 98%
rename from xfa/fwl/lightwidget/cfwl_edit.cpp
rename to xfa/fwl/core/cfwl_edit.cpp
index f5f0eb9..9e10692 100644
--- a/xfa/fwl/lightwidget/cfwl_edit.cpp
+++ b/xfa/fwl/core/cfwl_edit.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/lightwidget/cfwl_edit.h"
+#include "xfa/fwl/core/cfwl_edit.h"
 
 #include <memory>
 #include <vector>
diff --git a/xfa/fwl/lightwidget/cfwl_edit.h b/xfa/fwl/core/cfwl_edit.h
similarity index 93%
rename from xfa/fwl/lightwidget/cfwl_edit.h
rename to xfa/fwl/core/cfwl_edit.h
index cbca3d9..83343ac 100644
--- a/xfa/fwl/lightwidget/cfwl_edit.h
+++ b/xfa/fwl/core/cfwl_edit.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_LIGHTWIDGET_CFWL_EDIT_H_
-#define XFA_FWL_LIGHTWIDGET_CFWL_EDIT_H_
+#ifndef XFA_FWL_CORE_CFWL_EDIT_H_
+#define XFA_FWL_CORE_CFWL_EDIT_H_
 
 #include <vector>
 
+#include "xfa/fwl/core/cfwl_widget.h"
 #include "xfa/fwl/core/ifwl_edit.h"
-#include "xfa/fwl/lightwidget/cfwl_widget.h"
 
 class CFWL_WidgetProperties;
 class IFDE_TxtEdtDoRecord;
@@ -68,4 +68,4 @@
                                 const CFX_ByteStringC& bsReplace);
 };
 
-#endif  // XFA_FWL_LIGHTWIDGET_CFWL_EDIT_H_
+#endif  // XFA_FWL_CORE_CFWL_EDIT_H_
diff --git a/xfa/fwl/lightwidget/cfwl_listbox.cpp b/xfa/fwl/core/cfwl_listbox.cpp
similarity index 99%
rename from xfa/fwl/lightwidget/cfwl_listbox.cpp
rename to xfa/fwl/core/cfwl_listbox.cpp
index f55bcc6..3884e8c 100644
--- a/xfa/fwl/lightwidget/cfwl_listbox.cpp
+++ b/xfa/fwl/core/cfwl_listbox.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/lightwidget/cfwl_listbox.h"
+#include "xfa/fwl/core/cfwl_listbox.h"
 
 #include <memory>
 
diff --git a/xfa/fwl/lightwidget/cfwl_listbox.h b/xfa/fwl/core/cfwl_listbox.h
similarity index 95%
rename from xfa/fwl/lightwidget/cfwl_listbox.h
rename to xfa/fwl/core/cfwl_listbox.h
index 4a251ca..52caaea 100644
--- a/xfa/fwl/lightwidget/cfwl_listbox.h
+++ b/xfa/fwl/core/cfwl_listbox.h
@@ -4,16 +4,16 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_LIGHTWIDGET_CFWL_LISTBOX_H_
-#define XFA_FWL_LIGHTWIDGET_CFWL_LISTBOX_H_
+#ifndef XFA_FWL_CORE_CFWL_LISTBOX_H_
+#define XFA_FWL_CORE_CFWL_LISTBOX_H_
 
 #include <memory>
 #include <vector>
 
+#include "xfa/fwl/core/cfwl_widget.h"
 #include "xfa/fwl/core/fwl_error.h"
 #include "xfa/fwl/core/ifwl_listbox.h"
 #include "xfa/fwl/core/ifwl_widget.h"
-#include "xfa/fwl/lightwidget/cfwl_widget.h"
 
 class CFWL_ListItem;
 
@@ -120,4 +120,4 @@
   CFX_RectF m_rtCheckBox;
 };
 
-#endif  // XFA_FWL_LIGHTWIDGET_CFWL_LISTBOX_H_
+#endif  // XFA_FWL_CORE_CFWL_LISTBOX_H_
diff --git a/xfa/fwl/lightwidget/cfwl_picturebox.cpp b/xfa/fwl/core/cfwl_picturebox.cpp
similarity index 98%
rename from xfa/fwl/lightwidget/cfwl_picturebox.cpp
rename to xfa/fwl/core/cfwl_picturebox.cpp
index d4b9f30..92058a9 100644
--- a/xfa/fwl/lightwidget/cfwl_picturebox.cpp
+++ b/xfa/fwl/core/cfwl_picturebox.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/lightwidget/cfwl_picturebox.h"
+#include "xfa/fwl/core/cfwl_picturebox.h"
 
 #include <memory>
 
diff --git a/xfa/fwl/lightwidget/cfwl_picturebox.h b/xfa/fwl/core/cfwl_picturebox.h
similarity index 91%
rename from xfa/fwl/lightwidget/cfwl_picturebox.h
rename to xfa/fwl/core/cfwl_picturebox.h
index 149f3c9..584950f 100644
--- a/xfa/fwl/lightwidget/cfwl_picturebox.h
+++ b/xfa/fwl/core/cfwl_picturebox.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_LIGHTWIDGET_CFWL_PICTUREBOX_H_
-#define XFA_FWL_LIGHTWIDGET_CFWL_PICTUREBOX_H_
+#ifndef XFA_FWL_CORE_CFWL_PICTUREBOX_H_
+#define XFA_FWL_CORE_CFWL_PICTUREBOX_H_
 
+#include "xfa/fwl/core/cfwl_widget.h"
 #include "xfa/fwl/core/fwl_error.h"
 #include "xfa/fwl/core/ifwl_picturebox.h"
-#include "xfa/fwl/lightwidget/cfwl_widget.h"
 
 class CFWL_PictureBox : public CFWL_Widget {
  public:
@@ -64,4 +64,4 @@
   CFWL_PictureBoxDP m_PictureBoxDP;
 };
 
-#endif  // XFA_FWL_LIGHTWIDGET_CFWL_PICTUREBOX_H_
+#endif  // XFA_FWL_CORE_CFWL_PICTUREBOX_H_
diff --git a/xfa/fwl/lightwidget/cfwl_pushbutton.cpp b/xfa/fwl/core/cfwl_pushbutton.cpp
similarity index 97%
rename from xfa/fwl/lightwidget/cfwl_pushbutton.cpp
rename to xfa/fwl/core/cfwl_pushbutton.cpp
index d864ea9..8425f5d 100644
--- a/xfa/fwl/lightwidget/cfwl_pushbutton.cpp
+++ b/xfa/fwl/core/cfwl_pushbutton.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/lightwidget/cfwl_pushbutton.h"
+#include "xfa/fwl/core/cfwl_pushbutton.h"
 
 #include <memory>
 
diff --git a/xfa/fwl/lightwidget/cfwl_pushbutton.h b/xfa/fwl/core/cfwl_pushbutton.h
similarity index 86%
rename from xfa/fwl/lightwidget/cfwl_pushbutton.h
rename to xfa/fwl/core/cfwl_pushbutton.h
index 0199dbb..8f11660 100644
--- a/xfa/fwl/lightwidget/cfwl_pushbutton.h
+++ b/xfa/fwl/core/cfwl_pushbutton.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_LIGHTWIDGET_CFWL_PUSHBUTTON_H_
-#define XFA_FWL_LIGHTWIDGET_CFWL_PUSHBUTTON_H_
+#ifndef XFA_FWL_CORE_CFWL_PUSHBUTTON_H_
+#define XFA_FWL_CORE_CFWL_PUSHBUTTON_H_
 
+#include "xfa/fwl/core/cfwl_widget.h"
 #include "xfa/fwl/core/ifwl_pushbutton.h"
-#include "xfa/fwl/lightwidget/cfwl_widget.h"
 
 class CFWL_PushButton : public CFWL_Widget {
  public:
@@ -43,4 +43,4 @@
   CFWL_PushButtonDP m_buttonData;
 };
 
-#endif  // XFA_FWL_LIGHTWIDGET_CFWL_PUSHBUTTON_H_
+#endif  // XFA_FWL_CORE_CFWL_PUSHBUTTON_H_
diff --git a/xfa/fwl/lightwidget/cfwl_widget.cpp b/xfa/fwl/core/cfwl_widget.cpp
similarity index 98%
rename from xfa/fwl/lightwidget/cfwl_widget.cpp
rename to xfa/fwl/core/cfwl_widget.cpp
index c77bfc2..7f6bd3b 100644
--- a/xfa/fwl/lightwidget/cfwl_widget.cpp
+++ b/xfa/fwl/core/cfwl_widget.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/lightwidget/cfwl_widget.h"
+#include "xfa/fwl/core/cfwl_widget.h"
 
 #include "xfa/fde/tto/fde_textout.h"
 #include "xfa/fwl/core/cfwl_themetext.h"
diff --git a/xfa/fwl/lightwidget/cfwl_widget.h b/xfa/fwl/core/cfwl_widget.h
similarity index 89%
rename from xfa/fwl/lightwidget/cfwl_widget.h
rename to xfa/fwl/core/cfwl_widget.h
index 16b1141..cc69678 100644
--- a/xfa/fwl/lightwidget/cfwl_widget.h
+++ b/xfa/fwl/core/cfwl_widget.h
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_LIGHTWIDGET_CFWL_WIDGET_H_
-#define XFA_FWL_LIGHTWIDGET_CFWL_WIDGET_H_
+#ifndef XFA_FWL_CORE_CFWL_WIDGET_H_
+#define XFA_FWL_CORE_CFWL_WIDGET_H_
 
 #include <memory>
 
 #include "xfa/fwl/core/cfwl_event.h"
+#include "xfa/fwl/core/cfwl_widgetproperties.h"
 #include "xfa/fwl/core/ifwl_widget.h"
-#include "xfa/fwl/lightwidget/cfwl_widgetproperties.h"
 
 class CFWL_Event;
 class CFWL_Message;
@@ -62,4 +62,4 @@
   std::unique_ptr<CFWL_WidgetProperties> m_pProperties;
 };
 
-#endif  // XFA_FWL_LIGHTWIDGET_CFWL_WIDGET_H_
+#endif  // XFA_FWL_CORE_CFWL_WIDGET_H_
diff --git a/xfa/fwl/lightwidget/cfwl_widgetproperties.cpp b/xfa/fwl/core/cfwl_widgetproperties.cpp
similarity index 91%
rename from xfa/fwl/lightwidget/cfwl_widgetproperties.cpp
rename to xfa/fwl/core/cfwl_widgetproperties.cpp
index 31e1dda..fae1ff6 100644
--- a/xfa/fwl/lightwidget/cfwl_widgetproperties.cpp
+++ b/xfa/fwl/core/cfwl_widgetproperties.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/lightwidget/cfwl_widgetproperties.h"
+#include "xfa/fwl/core/cfwl_widgetproperties.h"
 
-#include "xfa/fwl/lightwidget/cfwl_widget.h"
+#include "xfa/fwl/core/cfwl_widget.h"
 
 CFWL_WidgetProperties::CFWL_WidgetProperties()
     : m_dwStyles(FWL_WGTSTYLE_Child),
diff --git a/xfa/fwl/lightwidget/cfwl_widgetproperties.h b/xfa/fwl/core/cfwl_widgetproperties.h
similarity index 84%
rename from xfa/fwl/lightwidget/cfwl_widgetproperties.h
rename to xfa/fwl/core/cfwl_widgetproperties.h
index 73e8fec..afadfc4 100644
--- a/xfa/fwl/lightwidget/cfwl_widgetproperties.h
+++ b/xfa/fwl/core/cfwl_widgetproperties.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_LIGHTWIDGET_CFWL_WIDGETPROPERTIES_H_
-#define XFA_FWL_LIGHTWIDGET_CFWL_WIDGETPROPERTIES_H_
+#ifndef XFA_FWL_CORE_CFWL_WIDGETPROPERTIES_H_
+#define XFA_FWL_CORE_CFWL_WIDGETPROPERTIES_H_
 
 #include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/fx_string.h"
@@ -34,4 +34,4 @@
   CFWL_Widget* m_pOwner;
 };
 
-#endif  // XFA_FWL_LIGHTWIDGET_CFWL_WIDGETPROPERTIES_H_
+#endif  // XFA_FWL_CORE_CFWL_WIDGETPROPERTIES_H_
diff --git a/xfa/fwl/core/ifwl_edit.h b/xfa/fwl/core/ifwl_edit.h
index e327a25..7c0c451 100644
--- a/xfa/fwl/core/ifwl_edit.h
+++ b/xfa/fwl/core/ifwl_edit.h
@@ -14,9 +14,9 @@
 #include "xfa/fde/ifde_txtedtdorecord.h"
 #include "xfa/fde/ifde_txtedtengine.h"
 #include "xfa/fwl/core/cfwl_event.h"
+#include "xfa/fwl/core/cfwl_widget.h"
 #include "xfa/fwl/core/ifwl_dataprovider.h"
 #include "xfa/fwl/core/ifwl_scrollbar.h"
-#include "xfa/fwl/lightwidget/cfwl_widget.h"
 #include "xfa/fxgraphics/cfx_path.h"
 
 #define FWL_STYLEEXT_EDT_ReadOnly (1L << 0)
diff --git a/xfa/fwl/core/ifwl_picturebox.cpp b/xfa/fwl/core/ifwl_picturebox.cpp
index 301c404..3539e08 100644
--- a/xfa/fwl/core/ifwl_picturebox.cpp
+++ b/xfa/fwl/core/ifwl_picturebox.cpp
@@ -6,8 +6,8 @@
 
 #include "xfa/fwl/core/ifwl_picturebox.h"
 
+#include "xfa/fwl/core/cfwl_picturebox.h"
 #include "xfa/fwl/core/fwl_noteimp.h"
-#include "xfa/fwl/lightwidget/cfwl_picturebox.h"
 
 IFWL_PictureBox::IFWL_PictureBox(const CFWL_WidgetImpProperties& properties)
     : IFWL_Widget(properties, nullptr),
diff --git a/xfa/fxfa/app/xfa_ffbarcode.cpp b/xfa/fxfa/app/xfa_ffbarcode.cpp
index 42564e9..ce9b045 100644
--- a/xfa/fxfa/app/xfa_ffbarcode.cpp
+++ b/xfa/fxfa/app/xfa_ffbarcode.cpp
@@ -7,9 +7,9 @@
 #include "xfa/fxfa/app/xfa_ffbarcode.h"
 
 #include "core/fxcrt/fx_ext.h"
+#include "xfa/fwl/core/cfwl_barcode.h"
 #include "xfa/fwl/core/fwl_noteimp.h"
 #include "xfa/fwl/core/ifwl_app.h"
-#include "xfa/fwl/lightwidget/cfwl_barcode.h"
 #include "xfa/fxfa/app/xfa_fffield.h"
 #include "xfa/fxfa/app/xfa_fftextedit.h"
 #include "xfa/fxfa/app/xfa_fwladapter.h"
diff --git a/xfa/fxfa/app/xfa_ffcheckbutton.cpp b/xfa/fxfa/app/xfa_ffcheckbutton.cpp
index 726abf7..cde9918 100644
--- a/xfa/fxfa/app/xfa_ffcheckbutton.cpp
+++ b/xfa/fxfa/app/xfa_ffcheckbutton.cpp
@@ -6,10 +6,10 @@
 
 #include "xfa/fxfa/app/xfa_ffcheckbutton.h"
 
+#include "xfa/fwl/core/cfwl_checkbox.h"
 #include "xfa/fwl/core/cfwl_message.h"
 #include "xfa/fwl/core/cfwl_widgetmgr.h"
 #include "xfa/fwl/core/fwl_noteimp.h"
-#include "xfa/fwl/lightwidget/cfwl_checkbox.h"
 #include "xfa/fxfa/app/xfa_ffexclgroup.h"
 #include "xfa/fxfa/app/xfa_fffield.h"
 #include "xfa/fxfa/xfa_ffapp.h"
diff --git a/xfa/fxfa/app/xfa_ffchoicelist.cpp b/xfa/fxfa/app/xfa_ffchoicelist.cpp
index cc9cc28..699f890 100644
--- a/xfa/fxfa/app/xfa_ffchoicelist.cpp
+++ b/xfa/fxfa/app/xfa_ffchoicelist.cpp
@@ -6,11 +6,11 @@
 
 #include "xfa/fxfa/app/xfa_ffchoicelist.h"
 
+#include "xfa/fwl/core/cfwl_combobox.h"
+#include "xfa/fwl/core/cfwl_listbox.h"
 #include "xfa/fwl/core/fwl_noteimp.h"
 #include "xfa/fwl/core/ifwl_app.h"
 #include "xfa/fwl/core/ifwl_edit.h"
-#include "xfa/fwl/lightwidget/cfwl_combobox.h"
-#include "xfa/fwl/lightwidget/cfwl_listbox.h"
 #include "xfa/fxfa/app/xfa_fffield.h"
 #include "xfa/fxfa/app/xfa_fwladapter.h"
 #include "xfa/fxfa/cxfa_eventparam.h"
diff --git a/xfa/fxfa/app/xfa_fffield.cpp b/xfa/fxfa/app/xfa_fffield.cpp
index a12a978..b14df7e 100644
--- a/xfa/fxfa/app/xfa_fffield.cpp
+++ b/xfa/fxfa/app/xfa_fffield.cpp
@@ -6,11 +6,11 @@
 
 #include "xfa/fxfa/app/xfa_fffield.h"
 
+#include "xfa/fwl/core/cfwl_edit.h"
 #include "xfa/fwl/core/cfwl_message.h"
+#include "xfa/fwl/core/cfwl_picturebox.h"
 #include "xfa/fwl/core/cfwl_widgetmgr.h"
 #include "xfa/fwl/core/ifwl_edit.h"
-#include "xfa/fwl/lightwidget/cfwl_edit.h"
-#include "xfa/fwl/lightwidget/cfwl_picturebox.h"
 #include "xfa/fxfa/app/xfa_fwltheme.h"
 #include "xfa/fxfa/app/xfa_textlayout.h"
 #include "xfa/fxfa/xfa_ffapp.h"
diff --git a/xfa/fxfa/app/xfa_fffield.h b/xfa/fxfa/app/xfa_fffield.h
index d7cd601..8481018 100644
--- a/xfa/fxfa/app/xfa_fffield.h
+++ b/xfa/fxfa/app/xfa_fffield.h
@@ -7,8 +7,8 @@
 #ifndef XFA_FXFA_APP_XFA_FFFIELD_H_
 #define XFA_FXFA_APP_XFA_FFFIELD_H_
 
+#include "xfa/fwl/core/cfwl_widget.h"
 #include "xfa/fwl/core/ifwl_widgetdelegate.h"
-#include "xfa/fwl/lightwidget/cfwl_widget.h"
 #include "xfa/fxfa/xfa_ffpageview.h"
 #include "xfa/fxfa/xfa_ffwidget.h"
 
diff --git a/xfa/fxfa/app/xfa_ffimageedit.cpp b/xfa/fxfa/app/xfa_ffimageedit.cpp
index bda3fdd..da56d3e 100644
--- a/xfa/fxfa/app/xfa_ffimageedit.cpp
+++ b/xfa/fxfa/app/xfa_ffimageedit.cpp
@@ -7,9 +7,9 @@
 #include "xfa/fxfa/app/xfa_ffimageedit.h"
 
 #include "xfa/fwl/core/cfwl_message.h"
+#include "xfa/fwl/core/cfwl_picturebox.h"
 #include "xfa/fwl/core/fwl_noteimp.h"
 #include "xfa/fwl/core/ifwl_app.h"
-#include "xfa/fwl/lightwidget/cfwl_picturebox.h"
 #include "xfa/fxfa/app/xfa_fffield.h"
 #include "xfa/fxfa/xfa_ffdoc.h"
 #include "xfa/fxfa/xfa_ffdocview.h"
diff --git a/xfa/fxfa/app/xfa_ffpushbutton.cpp b/xfa/fxfa/app/xfa_ffpushbutton.cpp
index 77341cd..a7f0c46 100644
--- a/xfa/fxfa/app/xfa_ffpushbutton.cpp
+++ b/xfa/fxfa/app/xfa_ffpushbutton.cpp
@@ -6,9 +6,9 @@
 
 #include "xfa/fxfa/app/xfa_ffpushbutton.h"
 
+#include "xfa/fwl/core/cfwl_pushbutton.h"
 #include "xfa/fwl/core/cfwl_widgetmgr.h"
 #include "xfa/fwl/core/fwl_noteimp.h"
-#include "xfa/fwl/lightwidget/cfwl_pushbutton.h"
 #include "xfa/fxfa/app/xfa_fffield.h"
 #include "xfa/fxfa/app/xfa_ffwidgetacc.h"
 #include "xfa/fxfa/app/xfa_textlayout.h"
diff --git a/xfa/fxfa/app/xfa_fftextedit.cpp b/xfa/fxfa/app/xfa_fftextedit.cpp
index ae594ea..9f3c94b 100644
--- a/xfa/fxfa/app/xfa_fftextedit.cpp
+++ b/xfa/fxfa/app/xfa_fftextedit.cpp
@@ -8,11 +8,11 @@
 
 #include <vector>
 
+#include "xfa/fwl/core/cfwl_datetimepicker.h"
+#include "xfa/fwl/core/cfwl_edit.h"
 #include "xfa/fwl/core/cfwl_message.h"
 #include "xfa/fwl/core/fwl_noteimp.h"
 #include "xfa/fwl/core/ifwl_edit.h"
-#include "xfa/fwl/lightwidget/cfwl_datetimepicker.h"
-#include "xfa/fwl/lightwidget/cfwl_edit.h"
 #include "xfa/fxfa/app/xfa_fffield.h"
 #include "xfa/fxfa/app/xfa_fwladapter.h"
 #include "xfa/fxfa/app/xfa_textlayout.h"