refactor(ui): adjust file structure

55 files changed, 45 insertions, 45 deletions

diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 6e3ee4be..24158e27 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -26,16 +26,16 @@
 
 # tracking source files
 aux_source_directory(. UI_SOURCE)
-aux_source_directory(keypair_details UI_SOURCE)
+aux_source_directory(dialog/keypair_details UI_SOURCE)
 aux_source_directory(widgets UI_SOURCE)
-aux_source_directory(key_generate UI_SOURCE)
+aux_source_directory(dialog/key_generate UI_SOURCE)
 aux_source_directory(main_window UI_SOURCE)
-aux_source_directory(help UI_SOURCE)
-aux_source_directory(settings UI_SOURCE)
+aux_source_directory(dialog/help UI_SOURCE)
+aux_source_directory(dialog/settings UI_SOURCE)
 aux_source_directory(thread UI_SOURCE)
-aux_source_directory(details UI_SOURCE)
+aux_source_directory(dialog/details UI_SOURCE)
 aux_source_directory(struct UI_SOURCE)
-aux_source_directory(import_export UI_SOURCE)
+aux_source_directory(dialog/import_export UI_SOURCE)
 aux_source_directory(dialog UI_SOURCE)
 
 # define libgpgfrontend_ui
diff --git a/src/ui/dialog/Wizard.h b/src/ui/dialog/Wizard.h
index 1ab0f782..879dc5d9 100644
--- a/src/ui/dialog/Wizard.h
+++ b/src/ui/dialog/Wizard.h
@@ -32,8 +32,8 @@
 #include "core/GpgConstants.h"
 #include "main_window/KeyMgmt.h"
 #include "ui/GpgFrontendUI.h"
-#include "ui/key_generate/KeygenDialog.h"
-#include "ui/settings/SettingsDialog.h"
+#include "ui/dialog/key_generate/KeygenDialog.h"
+#include "ui/dialog/settings/SettingsDialog.h"
 
 namespace GpgFrontend::UI {
 
diff --git a/src/ui/details/SignatureDetailsDialog.cpp b/src/ui/dialog/details/SignatureDetailsDialog.cpp
index a3ad03b3..a3ad03b3 100644
--- a/src/ui/details/SignatureDetailsDialog.cpp
+++ b/src/ui/dialog/details/SignatureDetailsDialog.cpp
diff --git a/src/ui/details/SignatureDetailsDialog.h b/src/ui/dialog/details/SignatureDetailsDialog.h
index 847b320b..847b320b 100644
--- a/src/ui/details/SignatureDetailsDialog.h
+++ b/src/ui/dialog/details/SignatureDetailsDialog.h
diff --git a/src/ui/details/VerifyDetailsDialog.cpp b/src/ui/dialog/details/VerifyDetailsDialog.cpp
index d2af4ee1..d2af4ee1 100644
--- a/src/ui/details/VerifyDetailsDialog.cpp
+++ b/src/ui/dialog/details/VerifyDetailsDialog.cpp
diff --git a/src/ui/details/VerifyDetailsDialog.h b/src/ui/dialog/details/VerifyDetailsDialog.h
index 97e2cc2d..97e2cc2d 100644
--- a/src/ui/details/VerifyDetailsDialog.h
+++ b/src/ui/dialog/details/VerifyDetailsDialog.h
diff --git a/src/ui/help/AboutDialog.cpp b/src/ui/dialog/help/AboutDialog.cpp
index 16f68958..7612d9d9 100644
--- a/src/ui/help/AboutDialog.cpp
+++ b/src/ui/dialog/help/AboutDialog.cpp
@@ -26,7 +26,7 @@
  *
  */
 
-#include "ui/help/AboutDialog.h"
+#include "AboutDialog.h"
 
 #include "GpgFrontendBuildInfo.h"
 #include "core/function/GlobalSettingStation.h"
diff --git a/src/ui/help/AboutDialog.h b/src/ui/dialog/help/AboutDialog.h
index 09a63734..09a63734 100644
--- a/src/ui/help/AboutDialog.h
+++ b/src/ui/dialog/help/AboutDialog.h
diff --git a/src/ui/import_export/ExportKeyPackageDialog.cpp b/src/ui/dialog/import_export/ExportKeyPackageDialog.cpp
index 074f07ba..074f07ba 100644
--- a/src/ui/import_export/ExportKeyPackageDialog.cpp
+++ b/src/ui/dialog/import_export/ExportKeyPackageDialog.cpp
diff --git a/src/ui/import_export/ExportKeyPackageDialog.h b/src/ui/dialog/import_export/ExportKeyPackageDialog.h
index c5f9a2b1..c5f9a2b1 100644
--- a/src/ui/import_export/ExportKeyPackageDialog.h
+++ b/src/ui/dialog/import_export/ExportKeyPackageDialog.h
diff --git a/src/ui/import_export/KeyImportDetailDialog.cpp b/src/ui/dialog/import_export/KeyImportDetailDialog.cpp
index 31183a34..31183a34 100644
--- a/src/ui/import_export/KeyImportDetailDialog.cpp
+++ b/src/ui/dialog/import_export/KeyImportDetailDialog.cpp
diff --git a/src/ui/import_export/KeyImportDetailDialog.h b/src/ui/dialog/import_export/KeyImportDetailDialog.h
index 06f44e94..06f44e94 100644
--- a/src/ui/import_export/KeyImportDetailDialog.h
+++ b/src/ui/dialog/import_export/KeyImportDetailDialog.h
diff --git a/src/ui/import_export/KeyServerImportDialog.cpp b/src/ui/dialog/import_export/KeyServerImportDialog.cpp
index 6430a22e..6430a22e 100644
--- a/src/ui/import_export/KeyServerImportDialog.cpp
+++ b/src/ui/dialog/import_export/KeyServerImportDialog.cpp
diff --git a/src/ui/import_export/KeyServerImportDialog.h b/src/ui/dialog/import_export/KeyServerImportDialog.h
index fd912bdd..fd912bdd 100644
--- a/src/ui/import_export/KeyServerImportDialog.h
+++ b/src/ui/dialog/import_export/KeyServerImportDialog.h
diff --git a/src/ui/import_export/KeyUploadDialog.cpp b/src/ui/dialog/import_export/KeyUploadDialog.cpp
index 055f2e1f..055f2e1f 100644
--- a/src/ui/import_export/KeyUploadDialog.cpp
+++ b/src/ui/dialog/import_export/KeyUploadDialog.cpp
diff --git a/src/ui/import_export/KeyUploadDialog.h b/src/ui/dialog/import_export/KeyUploadDialog.h
index d621f33a..d621f33a 100644
--- a/src/ui/import_export/KeyUploadDialog.h
+++ b/src/ui/dialog/import_export/KeyUploadDialog.h
diff --git a/src/ui/key_generate/KeygenDialog.cpp b/src/ui/dialog/key_generate/KeygenDialog.cpp
index d33ed5fb..42160ec9 100644
--- a/src/ui/key_generate/KeygenDialog.cpp
+++ b/src/ui/dialog/key_generate/KeygenDialog.cpp
@@ -26,7 +26,7 @@
  *
  */
 
-#include "ui/key_generate/KeygenDialog.h"
+#include "KeygenDialog.h"
 
 #include "core/function/GlobalSettingStation.h"
 #include "core/function/gpg/GpgKeyOpera.h"
diff --git a/src/ui/key_generate/KeygenDialog.h b/src/ui/dialog/key_generate/KeygenDialog.h
index baf10dbf..baf10dbf 100644
--- a/src/ui/key_generate/KeygenDialog.h
+++ b/src/ui/dialog/key_generate/KeygenDialog.h
diff --git a/src/ui/key_generate/SubkeyGenerateDialog.cpp b/src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp
index 5aa70825..806c0e50 100644
--- a/src/ui/key_generate/SubkeyGenerateDialog.cpp
+++ b/src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp
@@ -24,7 +24,7 @@
  *
  */
 
-#include "ui/key_generate/SubkeyGenerateDialog.h"
+#include "SubkeyGenerateDialog.h"
 
 #include "core/function/GlobalSettingStation.h"
 #include "core/function/gpg/GpgKeyGetter.h"
diff --git a/src/ui/key_generate/SubkeyGenerateDialog.h b/src/ui/dialog/key_generate/SubkeyGenerateDialog.h
index 1e6608b2..1e6608b2 100644
--- a/src/ui/key_generate/SubkeyGenerateDialog.h
+++ b/src/ui/dialog/key_generate/SubkeyGenerateDialog.h
diff --git a/src/ui/keypair_details/KeyDetailsDialog.cpp b/src/ui/dialog/keypair_details/KeyDetailsDialog.cpp
index dc3df9d4..9c2f8003 100644
--- a/src/ui/keypair_details/KeyDetailsDialog.cpp
+++ b/src/ui/dialog/keypair_details/KeyDetailsDialog.cpp
@@ -26,12 +26,12 @@
  *
  */
 
-#include "ui/keypair_details/KeyDetailsDialog.h"
+#include "KeyDetailsDialog.h"
 
-#include "ui/keypair_details/KeyPairDetailTab.h"
-#include "ui/keypair_details/KeyPairOperaTab.h"
-#include "ui/keypair_details/KeyPairSubkeyTab.h"
-#include "ui/keypair_details/KeyPairUIDTab.h"
+#include "KeyPairDetailTab.h"
+#include "KeyPairOperaTab.h"
+#include "KeyPairSubkeyTab.h"
+#include "KeyPairUIDTab.h"
 
 namespace GpgFrontend::UI {
 KeyDetailsDialog::KeyDetailsDialog(const GpgKey& key, QWidget* parent)
diff --git a/src/ui/keypair_details/KeyDetailsDialog.h b/src/ui/dialog/keypair_details/KeyDetailsDialog.h
index 1ddcda00..1ddcda00 100644
--- a/src/ui/keypair_details/KeyDetailsDialog.h
+++ b/src/ui/dialog/keypair_details/KeyDetailsDialog.h
diff --git a/src/ui/keypair_details/KeyNewUIDDialog.cpp b/src/ui/dialog/keypair_details/KeyNewUIDDialog.cpp
index 5b286603..18dd1967 100644
--- a/src/ui/keypair_details/KeyNewUIDDialog.cpp
+++ b/src/ui/dialog/keypair_details/KeyNewUIDDialog.cpp
@@ -24,7 +24,7 @@
  *
  */
 
-#include "ui/keypair_details/KeyNewUIDDialog.h"
+#include "KeyNewUIDDialog.h"
 
 #include "core/function/gpg/GpgKeyGetter.h"
 #include "core/function/gpg/GpgUIDOperator.h"
diff --git a/src/ui/keypair_details/KeyNewUIDDialog.h b/src/ui/dialog/keypair_details/KeyNewUIDDialog.h
index 291b59c4..291b59c4 100644
--- a/src/ui/keypair_details/KeyNewUIDDialog.h
+++ b/src/ui/dialog/keypair_details/KeyNewUIDDialog.h
diff --git a/src/ui/keypair_details/KeyPairDetailTab.cpp b/src/ui/dialog/keypair_details/KeyPairDetailTab.cpp
index 76f316e9..4a6e4b52 100644
--- a/src/ui/keypair_details/KeyPairDetailTab.cpp
+++ b/src/ui/dialog/keypair_details/KeyPairDetailTab.cpp
@@ -24,7 +24,7 @@
  *
  */
 
-#include "ui/keypair_details/KeyPairDetailTab.h"
+#include "KeyPairDetailTab.h"
 
 #include "core/function/gpg/GpgKeyGetter.h"
 #include "core/function/gpg/GpgKeyImportExporter.h"
diff --git a/src/ui/keypair_details/KeyPairDetailTab.h b/src/ui/dialog/keypair_details/KeyPairDetailTab.h
index 441596f0..91ccdab8 100644
--- a/src/ui/keypair_details/KeyPairDetailTab.h
+++ b/src/ui/dialog/keypair_details/KeyPairDetailTab.h
@@ -29,9 +29,9 @@
 
 #include "KeySetExpireDateDialog.h"
 #include "core/GpgContext.h"
-#include "import_export/KeyServerImportDialog.h"
-#include "import_export/KeyUploadDialog.h"
 #include "ui/GpgFrontendUI.h"
+#include "ui/dialog/import_export/KeyServerImportDialog.h"
+#include "ui/dialog/import_export/KeyUploadDialog.h"
 
 namespace GpgFrontend::UI {
 
diff --git a/src/ui/keypair_details/KeyPairOperaTab.cpp b/src/ui/dialog/keypair_details/KeyPairOperaTab.cpp
index 4f7cd66f..77eba0bc 100644
--- a/src/ui/keypair_details/KeyPairOperaTab.cpp
+++ b/src/ui/dialog/keypair_details/KeyPairOperaTab.cpp
@@ -26,12 +26,12 @@
 
 #include "KeyPairOperaTab.h"
 
+#include "KeySetExpireDateDialog.h"
 #include "core/function/gpg/GpgKeyImportExporter.h"
 #include "core/function/gpg/GpgKeyOpera.h"
-#include "import_export/KeyUploadDialog.h"
 #include "ui/SignalStation.h"
 #include "ui/UserInterfaceUtils.h"
-#include "ui/keypair_details/KeySetExpireDateDialog.h"
+#include "ui/dialog/import_export/KeyUploadDialog.h"
 
 namespace GpgFrontend::UI {
 
diff --git a/src/ui/keypair_details/KeyPairOperaTab.h b/src/ui/dialog/keypair_details/KeyPairOperaTab.h
index af6b1eee..af6b1eee 100644
--- a/src/ui/keypair_details/KeyPairOperaTab.h
+++ b/src/ui/dialog/keypair_details/KeyPairOperaTab.h
diff --git a/src/ui/keypair_details/KeyPairSubkeyTab.cpp b/src/ui/dialog/keypair_details/KeyPairSubkeyTab.cpp
index 46de550c..fe1d0798 100644
--- a/src/ui/keypair_details/KeyPairSubkeyTab.cpp
+++ b/src/ui/dialog/keypair_details/KeyPairSubkeyTab.cpp
@@ -26,7 +26,7 @@
  *
  */
 
-#include "ui/keypair_details/KeyPairSubkeyTab.h"
+#include "KeyPairSubkeyTab.h"
 
 #include "core/function/gpg/GpgKeyGetter.h"
 #include "ui/SignalStation.h"
diff --git a/src/ui/keypair_details/KeyPairSubkeyTab.h b/src/ui/dialog/keypair_details/KeyPairSubkeyTab.h
index a64d143c..a93ebca5 100644
--- a/src/ui/keypair_details/KeyPairSubkeyTab.h
+++ b/src/ui/dialog/keypair_details/KeyPairSubkeyTab.h
@@ -32,7 +32,7 @@
 #include "KeySetExpireDateDialog.h"
 #include "core/GpgContext.h"
 #include "ui/GpgFrontendUI.h"
-#include "ui/key_generate/SubkeyGenerateDialog.h"
+#include "ui/dialog/key_generate/SubkeyGenerateDialog.h"
 
 namespace GpgFrontend::UI {
 
diff --git a/src/ui/keypair_details/KeyPairUIDTab.cpp b/src/ui/dialog/keypair_details/KeyPairUIDTab.cpp
index 4cc835a8..b923dbec 100644
--- a/src/ui/keypair_details/KeyPairUIDTab.cpp
+++ b/src/ui/dialog/keypair_details/KeyPairUIDTab.cpp
@@ -24,7 +24,7 @@
  *
  */
 
-#include "ui/keypair_details/KeyPairUIDTab.h"
+#include "KeyPairUIDTab.h"
 
 #include "core/function/gpg/GpgKeyGetter.h"
 #include "core/function/gpg/GpgKeyManager.h"
diff --git a/src/ui/keypair_details/KeyPairUIDTab.h b/src/ui/dialog/keypair_details/KeyPairUIDTab.h
index fae8f9f2..fae8f9f2 100644
--- a/src/ui/keypair_details/KeyPairUIDTab.h
+++ b/src/ui/dialog/keypair_details/KeyPairUIDTab.h
diff --git a/src/ui/keypair_details/KeySetExpireDateDialog.cpp b/src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp
index 1f28736f..2c10b895 100644
--- a/src/ui/keypair_details/KeySetExpireDateDialog.cpp
+++ b/src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp
@@ -26,7 +26,7 @@
  *
  */
 
-#include "ui/keypair_details/KeySetExpireDateDialog.h"
+#include "KeySetExpireDateDialog.h"
 
 #include <utility>
 
diff --git a/src/ui/keypair_details/KeySetExpireDateDialog.h b/src/ui/dialog/keypair_details/KeySetExpireDateDialog.h
index 3cd6cd01..3cd6cd01 100644
--- a/src/ui/keypair_details/KeySetExpireDateDialog.h
+++ b/src/ui/dialog/keypair_details/KeySetExpireDateDialog.h
diff --git a/src/ui/keypair_details/KeyUIDSignDialog.cpp b/src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp
index b1845501..0f7de587 100644
--- a/src/ui/keypair_details/KeyUIDSignDialog.cpp
+++ b/src/ui/dialog/keypair_details/KeyUIDSignDialog.cpp
@@ -24,7 +24,7 @@
  *
  */
 
-#include "ui/keypair_details/KeyUIDSignDialog.h"
+#include "KeyUIDSignDialog.h"
 
 #include "core/function/gpg/GpgKeyGetter.h"
 #include "core/function/gpg/GpgKeyManager.h"
diff --git a/src/ui/keypair_details/KeyUIDSignDialog.h b/src/ui/dialog/keypair_details/KeyUIDSignDialog.h
index bfaff6d2..bfaff6d2 100644
--- a/src/ui/keypair_details/KeyUIDSignDialog.h
+++ b/src/ui/dialog/keypair_details/KeyUIDSignDialog.h
diff --git a/src/ui/settings/SettingsAdvanced.cpp b/src/ui/dialog/settings/SettingsAdvanced.cpp
index 516d4d02..516d4d02 100644
--- a/src/ui/settings/SettingsAdvanced.cpp
+++ b/src/ui/dialog/settings/SettingsAdvanced.cpp
diff --git a/src/ui/settings/SettingsAdvanced.h b/src/ui/dialog/settings/SettingsAdvanced.h
index c1a3d5a6..c1a3d5a6 100644
--- a/src/ui/settings/SettingsAdvanced.h
+++ b/src/ui/dialog/settings/SettingsAdvanced.h
diff --git a/src/ui/settings/SettingsAppearance.cpp b/src/ui/dialog/settings/SettingsAppearance.cpp
index 11a59985..11a59985 100644
--- a/src/ui/settings/SettingsAppearance.cpp
+++ b/src/ui/dialog/settings/SettingsAppearance.cpp
diff --git a/src/ui/settings/SettingsAppearance.h b/src/ui/dialog/settings/SettingsAppearance.h
index 7110d992..7110d992 100644
--- a/src/ui/settings/SettingsAppearance.h
+++ b/src/ui/dialog/settings/SettingsAppearance.h
diff --git a/src/ui/settings/SettingsDialog.cpp b/src/ui/dialog/settings/SettingsDialog.cpp
index f0aed7c2..e2677a0f 100644
--- a/src/ui/settings/SettingsDialog.cpp
+++ b/src/ui/dialog/settings/SettingsDialog.cpp
@@ -28,13 +28,13 @@
 
 #include "SettingsDialog.h"
 
+#include "SettingsAdvanced.h"
+#include "SettingsAppearance.h"
+#include "SettingsGeneral.h"
+#include "SettingsKeyServer.h"
+#include "SettingsNetwork.h"
 #include "core/function/GlobalSettingStation.h"
 #include "ui/main_window/MainWindow.h"
-#include "ui/settings/SettingsAdvanced.h"
-#include "ui/settings/SettingsAppearance.h"
-#include "ui/settings/SettingsGeneral.h"
-#include "ui/settings/SettingsKeyServer.h"
-#include "ui/settings/SettingsNetwork.h"
 
 namespace GpgFrontend::UI {
 
diff --git a/src/ui/settings/SettingsDialog.h b/src/ui/dialog/settings/SettingsDialog.h
index 172370d0..172370d0 100755..100644
--- a/src/ui/settings/SettingsDialog.h
+++ b/src/ui/dialog/settings/SettingsDialog.h
diff --git a/src/ui/settings/SettingsGeneral.cpp b/src/ui/dialog/settings/SettingsGeneral.cpp
index 3c7bca32..3c7bca32 100644
--- a/src/ui/settings/SettingsGeneral.cpp
+++ b/src/ui/dialog/settings/SettingsGeneral.cpp
diff --git a/src/ui/settings/SettingsGeneral.h b/src/ui/dialog/settings/SettingsGeneral.h
index b3e7d904..b3e7d904 100644
--- a/src/ui/settings/SettingsGeneral.h
+++ b/src/ui/dialog/settings/SettingsGeneral.h
diff --git a/src/ui/settings/SettingsKeyServer.cpp b/src/ui/dialog/settings/SettingsKeyServer.cpp
index 2c09b66c..2c09b66c 100644
--- a/src/ui/settings/SettingsKeyServer.cpp
+++ b/src/ui/dialog/settings/SettingsKeyServer.cpp
diff --git a/src/ui/settings/SettingsKeyServer.h b/src/ui/dialog/settings/SettingsKeyServer.h
index f983e69b..f983e69b 100644
--- a/src/ui/settings/SettingsKeyServer.h
+++ b/src/ui/dialog/settings/SettingsKeyServer.h
diff --git a/src/ui/settings/SettingsNetwork.cpp b/src/ui/dialog/settings/SettingsNetwork.cpp
index d4edae42..d4edae42 100644
--- a/src/ui/settings/SettingsNetwork.cpp
+++ b/src/ui/dialog/settings/SettingsNetwork.cpp
diff --git a/src/ui/settings/SettingsNetwork.h b/src/ui/dialog/settings/SettingsNetwork.h
index d4c0d00d..d4c0d00d 100644
--- a/src/ui/settings/SettingsNetwork.h
+++ b/src/ui/dialog/settings/SettingsNetwork.h
diff --git a/src/ui/main_window/KeyMgmt.cpp b/src/ui/main_window/KeyMgmt.cpp
index 57db8cdf..b6e81e94 100644
--- a/src/ui/main_window/KeyMgmt.cpp
+++ b/src/ui/main_window/KeyMgmt.cpp
@@ -37,8 +37,8 @@
 #include "core/function/gpg/GpgKeyOpera.h"
 #include "ui/SignalStation.h"
 #include "ui/UserInterfaceUtils.h"
-#include "ui/import_export/ExportKeyPackageDialog.h"
-#include "ui/key_generate/SubkeyGenerateDialog.h"
+#include "ui/dialog/import_export/ExportKeyPackageDialog.h"
+#include "ui/dialog/key_generate/SubkeyGenerateDialog.h"
 #include "ui/main_window/MainWindow.h"
 
 namespace GpgFrontend::UI {
diff --git a/src/ui/main_window/KeyMgmt.h b/src/ui/main_window/KeyMgmt.h
index 8821d41b..2073113a 100644
--- a/src/ui/main_window/KeyMgmt.h
+++ b/src/ui/main_window/KeyMgmt.h
@@ -30,10 +30,10 @@
 #define __KEYMGMT_H__
 
 #include "ui/GpgFrontendUI.h"
-#include "ui/import_export/KeyImportDetailDialog.h"
-#include "ui/import_export/KeyServerImportDialog.h"
-#include "ui/key_generate/KeygenDialog.h"
-#include "ui/keypair_details/KeyDetailsDialog.h"
+#include "ui/dialog/import_export/KeyImportDetailDialog.h"
+#include "ui/dialog/import_export/KeyServerImportDialog.h"
+#include "ui/dialog/key_generate/KeygenDialog.h"
+#include "ui/dialog/keypair_details/KeyDetailsDialog.h"
 #include "ui/main_window/GeneralMainWindow.h"
 #include "ui/widgets/KeyList.h"
 
diff --git a/src/ui/main_window/MainWindow.h b/src/ui/main_window/MainWindow.h
index 914a7d3b..8f3c46e1 100644
--- a/src/ui/main_window/MainWindow.h
+++ b/src/ui/main_window/MainWindow.h
@@ -37,10 +37,10 @@
 #include "ui/GpgFrontendUI.h"
 #include "ui/dialog/WaitingDialog.h"
 #include "ui/dialog/Wizard.h"
-#include "ui/help/AboutDialog.h"
-#include "ui/import_export/KeyUploadDialog.h"
+#include "ui/dialog/help/AboutDialog.h"
+#include "ui/dialog/import_export/KeyUploadDialog.h"
+#include "ui/dialog/settings/SettingsDialog.h"
 #include "ui/main_window/GeneralMainWindow.h"
-#include "ui/settings/SettingsDialog.h"
 #include "ui/widgets/FindWidget.h"
 #include "ui/widgets/InfoBoardWidget.h"
 #include "ui/widgets/TextEdit.h"
diff --git a/src/ui/main_window/MainWindowSlotFunction.cpp b/src/ui/main_window/MainWindowSlotFunction.cpp
index 0ad52248..9108a124 100644
--- a/src/ui/main_window/MainWindowSlotFunction.cpp
+++ b/src/ui/main_window/MainWindowSlotFunction.cpp
@@ -41,7 +41,7 @@
 #include "core/model/GpgKey.h"
 #include "core/thread/TaskRunner.h"
 #include "ui/UserInterfaceUtils.h"
-#include "ui/help/AboutDialog.h"
+#include "ui/dialog/help/AboutDialog.h"
 #include "ui/widgets/SignersPicker.h"
 
 namespace GpgFrontend::UI {
diff --git a/src/ui/widgets/InfoBoardWidget.h b/src/ui/widgets/InfoBoardWidget.h
index 7f456777..47740456 100644
--- a/src/ui/widgets/InfoBoardWidget.h
+++ b/src/ui/widgets/InfoBoardWidget.h
@@ -31,7 +31,7 @@
 
 #include "PlainTextEditorPage.h"
 #include "core/function/result_analyse/GpgVerifyResultAnalyse.h"
-#include "ui/details/VerifyDetailsDialog.h"
+#include "ui/dialog/details/VerifyDetailsDialog.h"
 
 class Ui_InfoBoard;
 
diff --git a/src/ui/widgets/KeyList.h b/src/ui/widgets/KeyList.h
index 60449ad9..f1c88cc6 100644
--- a/src/ui/widgets/KeyList.h
+++ b/src/ui/widgets/KeyList.h
@@ -32,7 +32,7 @@
 #include <utility>
 
 #include "core/GpgContext.h"
-#include "ui/import_export/KeyImportDetailDialog.h"
+#include "ui/dialog/import_export/KeyImportDetailDialog.h"
 
 class Ui_KeyList;
 
diff --git a/src/ui/widgets/VerifyKeyDetailBox.h b/src/ui/widgets/VerifyKeyDetailBox.h
index 57f133d5..6ed9fd52 100644
--- a/src/ui/widgets/VerifyKeyDetailBox.h
+++ b/src/ui/widgets/VerifyKeyDetailBox.h
@@ -29,7 +29,7 @@
 #ifndef __VERIFYKEYDETAILBOX_H__
 #define __VERIFYKEYDETAILBOX_H__
 
-#include "ui/import_export/KeyServerImportDialog.h"
+#include "ui/dialog/import_export/KeyServerImportDialog.h"
 #include "ui/widgets/KeyList.h"
 
 namespace GpgFrontend::UI {