diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
index d8aca3cdb..2b590e66c 100644
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@@ -1,63 +1,2 @@
-find_package(Qt6 REQUIRED NO_MODULE COMPONENTS
-    Core
-    Widgets
-    Gui
-)
-
-find_library(ff7tk ${CMAKE_CURRENT_BINARY_DIR}/src/data)
-
-set ( ff7tkWidgets_SRC
-    AchievementEditor.cpp
-    CharEditor.cpp
-    ChocoboEditor.cpp
-    ChocoboLabel.cpp
-    ChocoboManager.cpp
-    DialogPreview.cpp
-    DoubleCheckBox.cpp
-    ItemList.cpp
-    ItemListView.cpp
-    ItemPreview.cpp
-    ItemSelector.cpp
-    ItemSelectionDelegate.cpp
-    LocationViewer.cpp
-    MateriaEditor.cpp
-    MenuListWidget.cpp
-    MetadataCreator.cpp
-    OptionsWidget.cpp
-    PhsListWidget.cpp
-    SlotPreview.cpp
-    SlotSelect.cpp
-)
-
-set (ff7tkWidgets_HEADERS
-    AchievementEditor.h
-    ChocoboLabel.h
-    DoubleCheckBox.h
-    ItemSelector.h
-    ItemSelectionDelegate.h
-    MenuListWidget.h
-    PhsListWidget.h
-    CharEditor.h
-    ChocoboManager.h
-    ItemList.h
-    ItemListView.h
-    LocationViewer.h
-    MetadataCreator.h
-    SlotPreview.h
-    ChocoboEditor.h
-    DialogPreview.h
-    ItemPreview.h
-    MateriaEditor.h
-    OptionsWidget.h
-    SlotSelect.h
-    ${CMAKE_CURRENT_BINARY_DIR}/ff7tkwidgets_export.h
-)
-
-set( ff7tkWidgets_PublicLIBLINKS
-       Qt::Core
-       Qt::Widgets
-       Qt::Gui
-       ff7tk::ff7tk
-)
-
-MAKE_LIBRARY(ff7tkWidgets ff7tk/widgets)
+add_subdirectory(common)
+add_subdirectory(data)
diff --git a/src/widgets/common/CMakeLists.txt b/src/widgets/common/CMakeLists.txt
new file mode 100644
index 000000000..3643aaaf0
--- /dev/null
+++ b/src/widgets/common/CMakeLists.txt
@@ -0,0 +1,24 @@
+find_package(Qt6 REQUIRED NO_MODULE COMPONENTS
+    Core
+    Widgets
+    Gui
+)
+
+set ( ff7tkQtWidgets_SRC
+    DialogPreview.cpp
+    DoubleCheckBox.cpp
+)
+
+set (ff7tkQtWidgets_HEADERS
+    DialogPreview.h
+    DoubleCheckBox.h
+    ${CMAKE_CURRENT_BINARY_DIR}/ff7tkqtwidgets_export.h
+)
+
+set( ff7tkQtWidgets_PublicLIBLINKS
+       Qt::Core
+       Qt::Widgets
+       Qt::Gui
+)
+
+MAKE_LIBRARY(ff7tkQtWidgets ff7tk/widgets/common)
diff --git a/src/widgets/DialogPreview.cpp b/src/widgets/common/DialogPreview.cpp
similarity index 100%
rename from src/widgets/DialogPreview.cpp
rename to src/widgets/common/DialogPreview.cpp
diff --git a/src/widgets/DialogPreview.h b/src/widgets/common/DialogPreview.h
similarity index 95%
rename from src/widgets/DialogPreview.h
rename to src/widgets/common/DialogPreview.h
index 12d03c564..dab81d7cc 100644
--- a/src/widgets/DialogPreview.h
+++ b/src/widgets/common/DialogPreview.h
@@ -16,9 +16,9 @@
 #pragma once
 
 #include <QLabel>
-#include <ff7tkwidgets_export.h>
+#include <ff7tkqtwidgets_export.h>
 
-class FF7TKWIDGETS_EXPORT DialogPreview : public QLabel
+class FF7TKQTWIDGETS_EXPORT DialogPreview : public QLabel
 {
     Q_OBJECT
 
diff --git a/src/widgets/DoubleCheckBox.cpp b/src/widgets/common/DoubleCheckBox.cpp
similarity index 100%
rename from src/widgets/DoubleCheckBox.cpp
rename to src/widgets/common/DoubleCheckBox.cpp
diff --git a/src/widgets/DoubleCheckBox.h b/src/widgets/common/DoubleCheckBox.h
similarity index 96%
rename from src/widgets/DoubleCheckBox.h
rename to src/widgets/common/DoubleCheckBox.h
index 87c54915e..7efda1f36 100644
--- a/src/widgets/DoubleCheckBox.h
+++ b/src/widgets/common/DoubleCheckBox.h
@@ -16,7 +16,7 @@
 #pragma once
 
 #include <QWidget>
-#include <ff7tkwidgets_export.h>
+#include <ff7tkqtwidgets_export.h>
 
 class QCheckBox;
 class QLabel;
@@ -24,7 +24,7 @@ class QLabel;
 /** \class DoubleCheckBox
  *  \brief one text two checkable boxes
  */
-class FF7TKWIDGETS_EXPORT DoubleCheckBox : public QWidget
+class FF7TKQTWIDGETS_EXPORT DoubleCheckBox : public QWidget
 {
     Q_OBJECT
 public:
diff --git a/src/widgets/ff7tkWidgetsConfig.cmake.in b/src/widgets/common/ff7tkQtWidgetsConfig.cmake.in
similarity index 100%
rename from src/widgets/ff7tkWidgetsConfig.cmake.in
rename to src/widgets/common/ff7tkQtWidgetsConfig.cmake.in
diff --git a/src/widgets/AchievementEditor.cpp b/src/widgets/data/AchievementEditor.cpp
similarity index 100%
rename from src/widgets/AchievementEditor.cpp
rename to src/widgets/data/AchievementEditor.cpp
diff --git a/src/widgets/AchievementEditor.h b/src/widgets/data/AchievementEditor.h
similarity index 100%
rename from src/widgets/AchievementEditor.h
rename to src/widgets/data/AchievementEditor.h
diff --git a/src/widgets/data/CMakeLists.txt b/src/widgets/data/CMakeLists.txt
new file mode 100644
index 000000000..e4f957bd5
--- /dev/null
+++ b/src/widgets/data/CMakeLists.txt
@@ -0,0 +1,61 @@
+find_package(Qt6 REQUIRED NO_MODULE COMPONENTS
+    Core
+    Widgets
+    Gui
+)
+
+find_library(ff7tk ${CMAKE_CURRENT_BINARY_DIR}/src/data)
+find_library(ff7tkQtWidgets ${CMAKE_CURRENT_BINARY_DIR}/src/widgets/common)
+
+set ( ff7tkWidgets_SRC
+    AchievementEditor.cpp
+    CharEditor.cpp
+    ChocoboEditor.cpp
+    ChocoboLabel.cpp
+    ChocoboManager.cpp
+    ItemList.cpp
+    ItemListView.cpp
+    ItemPreview.cpp
+    ItemSelector.cpp
+    ItemSelectionDelegate.cpp
+    LocationViewer.cpp
+    MateriaEditor.cpp
+    MenuListWidget.cpp
+    MetadataCreator.cpp
+    OptionsWidget.cpp
+    PhsListWidget.cpp
+    SlotPreview.cpp
+    SlotSelect.cpp
+)
+
+set (ff7tkWidgets_HEADERS
+    AchievementEditor.h
+    ChocoboLabel.h
+    ItemSelector.h
+    ItemSelectionDelegate.h
+    MenuListWidget.h
+    PhsListWidget.h
+    CharEditor.h
+    ChocoboManager.h
+    ItemList.h
+    ItemListView.h
+    LocationViewer.h
+    MetadataCreator.h
+    SlotPreview.h
+    ChocoboEditor.h
+    ItemPreview.h
+    MateriaEditor.h
+    OptionsWidget.h
+    SlotSelect.h
+    ${CMAKE_CURRENT_BINARY_DIR}/ff7tkwidgets_export.h
+)
+
+set( ff7tkWidgets_PublicLIBLINKS
+       Qt::Core
+       Qt::Widgets
+       Qt::Gui
+       ff7tk::ff7tk
+       ff7tk::ff7tkQtWidgets
+)
+
+MAKE_LIBRARY(ff7tkWidgets ff7tk/widgets/data)
diff --git a/src/widgets/CharEditor.cpp b/src/widgets/data/CharEditor.cpp
similarity index 100%
rename from src/widgets/CharEditor.cpp
rename to src/widgets/data/CharEditor.cpp
diff --git a/src/widgets/CharEditor.h b/src/widgets/data/CharEditor.h
similarity index 100%
rename from src/widgets/CharEditor.h
rename to src/widgets/data/CharEditor.h
diff --git a/src/widgets/ChocoboEditor.cpp b/src/widgets/data/ChocoboEditor.cpp
similarity index 100%
rename from src/widgets/ChocoboEditor.cpp
rename to src/widgets/data/ChocoboEditor.cpp
diff --git a/src/widgets/ChocoboEditor.h b/src/widgets/data/ChocoboEditor.h
similarity index 100%
rename from src/widgets/ChocoboEditor.h
rename to src/widgets/data/ChocoboEditor.h
diff --git a/src/widgets/ChocoboLabel.cpp b/src/widgets/data/ChocoboLabel.cpp
similarity index 100%
rename from src/widgets/ChocoboLabel.cpp
rename to src/widgets/data/ChocoboLabel.cpp
diff --git a/src/widgets/ChocoboLabel.h b/src/widgets/data/ChocoboLabel.h
similarity index 100%
rename from src/widgets/ChocoboLabel.h
rename to src/widgets/data/ChocoboLabel.h
diff --git a/src/widgets/ChocoboManager.cpp b/src/widgets/data/ChocoboManager.cpp
similarity index 100%
rename from src/widgets/ChocoboManager.cpp
rename to src/widgets/data/ChocoboManager.cpp
diff --git a/src/widgets/ChocoboManager.h b/src/widgets/data/ChocoboManager.h
similarity index 100%
rename from src/widgets/ChocoboManager.h
rename to src/widgets/data/ChocoboManager.h
diff --git a/src/widgets/ItemList.cpp b/src/widgets/data/ItemList.cpp
similarity index 100%
rename from src/widgets/ItemList.cpp
rename to src/widgets/data/ItemList.cpp
diff --git a/src/widgets/ItemList.h b/src/widgets/data/ItemList.h
similarity index 100%
rename from src/widgets/ItemList.h
rename to src/widgets/data/ItemList.h
diff --git a/src/widgets/ItemListView.cpp b/src/widgets/data/ItemListView.cpp
similarity index 100%
rename from src/widgets/ItemListView.cpp
rename to src/widgets/data/ItemListView.cpp
diff --git a/src/widgets/ItemListView.h b/src/widgets/data/ItemListView.h
similarity index 100%
rename from src/widgets/ItemListView.h
rename to src/widgets/data/ItemListView.h
diff --git a/src/widgets/ItemPreview.cpp b/src/widgets/data/ItemPreview.cpp
similarity index 100%
rename from src/widgets/ItemPreview.cpp
rename to src/widgets/data/ItemPreview.cpp
diff --git a/src/widgets/ItemPreview.h b/src/widgets/data/ItemPreview.h
similarity index 100%
rename from src/widgets/ItemPreview.h
rename to src/widgets/data/ItemPreview.h
diff --git a/src/widgets/ItemSelectionDelegate.cpp b/src/widgets/data/ItemSelectionDelegate.cpp
similarity index 100%
rename from src/widgets/ItemSelectionDelegate.cpp
rename to src/widgets/data/ItemSelectionDelegate.cpp
diff --git a/src/widgets/ItemSelectionDelegate.h b/src/widgets/data/ItemSelectionDelegate.h
similarity index 100%
rename from src/widgets/ItemSelectionDelegate.h
rename to src/widgets/data/ItemSelectionDelegate.h
diff --git a/src/widgets/ItemSelector.cpp b/src/widgets/data/ItemSelector.cpp
similarity index 100%
rename from src/widgets/ItemSelector.cpp
rename to src/widgets/data/ItemSelector.cpp
diff --git a/src/widgets/ItemSelector.h b/src/widgets/data/ItemSelector.h
similarity index 100%
rename from src/widgets/ItemSelector.h
rename to src/widgets/data/ItemSelector.h
diff --git a/src/widgets/LocationViewer.cpp b/src/widgets/data/LocationViewer.cpp
similarity index 100%
rename from src/widgets/LocationViewer.cpp
rename to src/widgets/data/LocationViewer.cpp
diff --git a/src/widgets/LocationViewer.h b/src/widgets/data/LocationViewer.h
similarity index 100%
rename from src/widgets/LocationViewer.h
rename to src/widgets/data/LocationViewer.h
diff --git a/src/widgets/MateriaEditor.cpp b/src/widgets/data/MateriaEditor.cpp
similarity index 100%
rename from src/widgets/MateriaEditor.cpp
rename to src/widgets/data/MateriaEditor.cpp
diff --git a/src/widgets/MateriaEditor.h b/src/widgets/data/MateriaEditor.h
similarity index 100%
rename from src/widgets/MateriaEditor.h
rename to src/widgets/data/MateriaEditor.h
diff --git a/src/widgets/MenuListWidget.cpp b/src/widgets/data/MenuListWidget.cpp
similarity index 100%
rename from src/widgets/MenuListWidget.cpp
rename to src/widgets/data/MenuListWidget.cpp
diff --git a/src/widgets/MenuListWidget.h b/src/widgets/data/MenuListWidget.h
similarity index 100%
rename from src/widgets/MenuListWidget.h
rename to src/widgets/data/MenuListWidget.h
diff --git a/src/widgets/MetadataCreator.cpp b/src/widgets/data/MetadataCreator.cpp
similarity index 100%
rename from src/widgets/MetadataCreator.cpp
rename to src/widgets/data/MetadataCreator.cpp
diff --git a/src/widgets/MetadataCreator.h b/src/widgets/data/MetadataCreator.h
similarity index 100%
rename from src/widgets/MetadataCreator.h
rename to src/widgets/data/MetadataCreator.h
diff --git a/src/widgets/OptionsWidget.cpp b/src/widgets/data/OptionsWidget.cpp
similarity index 100%
rename from src/widgets/OptionsWidget.cpp
rename to src/widgets/data/OptionsWidget.cpp
diff --git a/src/widgets/OptionsWidget.h b/src/widgets/data/OptionsWidget.h
similarity index 100%
rename from src/widgets/OptionsWidget.h
rename to src/widgets/data/OptionsWidget.h
diff --git a/src/widgets/PhsListWidget.cpp b/src/widgets/data/PhsListWidget.cpp
similarity index 100%
rename from src/widgets/PhsListWidget.cpp
rename to src/widgets/data/PhsListWidget.cpp
diff --git a/src/widgets/PhsListWidget.h b/src/widgets/data/PhsListWidget.h
similarity index 100%
rename from src/widgets/PhsListWidget.h
rename to src/widgets/data/PhsListWidget.h
diff --git a/src/widgets/SlotPreview.cpp b/src/widgets/data/SlotPreview.cpp
similarity index 100%
rename from src/widgets/SlotPreview.cpp
rename to src/widgets/data/SlotPreview.cpp
diff --git a/src/widgets/SlotPreview.h b/src/widgets/data/SlotPreview.h
similarity index 100%
rename from src/widgets/SlotPreview.h
rename to src/widgets/data/SlotPreview.h
diff --git a/src/widgets/SlotSelect.cpp b/src/widgets/data/SlotSelect.cpp
similarity index 100%
rename from src/widgets/SlotSelect.cpp
rename to src/widgets/data/SlotSelect.cpp
diff --git a/src/widgets/SlotSelect.h b/src/widgets/data/SlotSelect.h
similarity index 100%
rename from src/widgets/SlotSelect.h
rename to src/widgets/data/SlotSelect.h
diff --git a/src/widgets/data/ff7tkWidgetsConfig.cmake.in b/src/widgets/data/ff7tkWidgetsConfig.cmake.in
new file mode 100644
index 000000000..776cd90c6
--- /dev/null
+++ b/src/widgets/data/ff7tkWidgetsConfig.cmake.in
@@ -0,0 +1,9 @@
+@PACKAGE_INIT@
+
+include(CMakeFindDependencyMacro)
+find_dependency(Qt6 "@REQUIRED_QT_VERSION@" COMPONENTS
+    Core
+    Gui
+    Widgets
+)
+include("${CMAKE_CURRENT_LIST_DIR}/ff7tkTargets.cmake")