<refactor>(core, ui): Adjust the core code directory structure.

61 files changed, 81 insertions, 82 deletions

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 0a81e5dc..7463e1e7 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -24,12 +24,11 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-aux_source_directory(./result_analyse GPG_SOURCE)
+aux_source_directory(./function/result_analyse GPG_SOURCE)
+aux_source_directory(./function/gpg GPG_SOURCE)
+aux_source_directory(./function/aes GPG_SOURCE)
 aux_source_directory(./function GPG_SOURCE)
 aux_source_directory(./model GPG_SOURCE)
-aux_source_directory(./key_package GPG_SOURCE)
-aux_source_directory(./aes GPG_SOURCE)
-aux_source_directory(./file GPG_SOURCE)
 aux_source_directory(. GPG_SOURCE)
 
 add_library(gpgfrontend_core STATIC ${GPG_SOURCE})
diff --git a/src/core/file/FileOperator.cpp b/src/core/function/FileOperator.cpp
index e721fc7e..e721fc7e 100644
--- a/src/core/file/FileOperator.cpp
+++ b/src/core/function/FileOperator.cpp
diff --git a/src/core/file/FileOperator.h b/src/core/function/FileOperator.h
index de195a96..de195a96 100644
--- a/src/core/file/FileOperator.h
+++ b/src/core/function/FileOperator.h
diff --git a/src/core/key_package/KeyPackageOperator.cpp b/src/core/function/KeyPackageOperator.cpp
index b0e21f9f..89210987 100644
--- a/src/core/key_package/KeyPackageOperator.cpp
+++ b/src/core/function/KeyPackageOperator.cpp
@@ -28,11 +28,11 @@
 
 #include "KeyPackageOperator.h"
 
-#include <qt-aes/qaesencryption.h>
+#include "qt-aes/qaesencryption.h"
 
-#include "core/file/FileOperator.h"
-#include "core/function/GpgKeyGetter.h"
-#include "core/function/GpgKeyImportExporter.h"
+#include "FileOperator.h"
+#include "function/gpg/GpgKeyGetter.h"
+#include "function/gpg/GpgKeyImportExporter.h"
 
 namespace GpgFrontend {
 
diff --git a/src/core/key_package/KeyPackageOperator.h b/src/core/function/KeyPackageOperator.h
index d4185ac8..ee81e86e 100644
--- a/src/core/key_package/KeyPackageOperator.h
+++ b/src/core/function/KeyPackageOperator.h
@@ -30,7 +30,7 @@
 #define GPGFRONTEND_KEYPACKAGEOPERATOR_H
 
 #include "core/GpgFrontendCore.h"
-#include "core/function/GpgKeyImportExporter.h"
+#include "core/function/gpg/GpgKeyImportExporter.h"
 
 namespace GpgFrontend {
 
diff --git a/src/core/aes/aes_ssl.h b/src/core/function/aes/aes_ssl.h
index b5f0820f..b5f0820f 100644
--- a/src/core/aes/aes_ssl.h
+++ b/src/core/function/aes/aes_ssl.h
diff --git a/src/core/aes/aes_ssl_cbc.cpp b/src/core/function/aes/aes_ssl_cbc.cpp
index 95ae0ce2..95ae0ce2 100644
--- a/src/core/aes/aes_ssl_cbc.cpp
+++ b/src/core/function/aes/aes_ssl_cbc.cpp
diff --git a/src/core/function/GpgBasicOperator.cpp b/src/core/function/gpg/GpgBasicOperator.cpp
index 0fd13e33..b92404a9 100644
--- a/src/core/function/GpgBasicOperator.cpp
+++ b/src/core/function/gpg/GpgBasicOperator.cpp
@@ -26,11 +26,11 @@
  *
  */
 
-#include "core/function/GpgBasicOperator.h"
+#include "GpgBasicOperator.h"
 
 #include <vector>
 
-#include "core/function/GpgKeyGetter.h"
+#include "GpgKeyGetter.h"
 
 GpgFrontend::GpgError GpgFrontend::GpgBasicOperator::Encrypt(
     KeyListPtr keys, GpgFrontend::BypeArrayRef in_buffer,
diff --git a/src/core/function/GpgBasicOperator.h b/src/core/function/gpg/GpgBasicOperator.h
index 9b9d9f63..9b9d9f63 100644
--- a/src/core/function/GpgBasicOperator.h
+++ b/src/core/function/gpg/GpgBasicOperator.h
diff --git a/src/core/function/GpgCommandExecutor.cpp b/src/core/function/gpg/GpgCommandExecutor.cpp
index 0915b092..a6a67d08 100644
--- a/src/core/function/GpgCommandExecutor.cpp
+++ b/src/core/function/gpg/GpgCommandExecutor.cpp
@@ -25,7 +25,7 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  */
-#include "core/function/GpgCommandExecutor.h"
+#include "GpgCommandExecutor.h"
 #ifndef WINDOWS
 #include <boost/asio.hpp>
 #endif
diff --git a/src/core/function/GpgCommandExecutor.h b/src/core/function/gpg/GpgCommandExecutor.h
index 49baf406..49baf406 100644
--- a/src/core/function/GpgCommandExecutor.h
+++ b/src/core/function/gpg/GpgCommandExecutor.h
diff --git a/src/core/function/GpgFileOpera.cpp b/src/core/function/gpg/GpgFileOpera.cpp
index 15c359da..7044353b 100644
--- a/src/core/function/GpgFileOpera.cpp
+++ b/src/core/function/gpg/GpgFileOpera.cpp
@@ -25,14 +25,14 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  */
-#include "core/function/GpgFileOpera.h"
+#include "GpgFileOpera.h"
 
 #include <memory>
 #include <string>
 
 #include "GpgConstants.h"
-#include "core/function/GpgBasicOperator.h"
-#include "core/file/FileOperator.h"
+#include "GpgBasicOperator.h"
+#include "function/FileOperator.h"
 
 GpgFrontend::GpgError GpgFrontend::GpgFileOpera::EncryptFile(
     KeyListPtr keys, const std::string& in_path, const std::string& out_path,
diff --git a/src/core/function/GpgFileOpera.h b/src/core/function/gpg/GpgFileOpera.h
index f21bf04c..f21bf04c 100644
--- a/src/core/function/GpgFileOpera.h
+++ b/src/core/function/gpg/GpgFileOpera.h
diff --git a/src/core/function/GpgKeyGetter.cpp b/src/core/function/gpg/GpgKeyGetter.cpp
index 604c4164..1a4715e7 100644
--- a/src/core/function/GpgKeyGetter.cpp
+++ b/src/core/function/gpg/GpgKeyGetter.cpp
@@ -26,7 +26,7 @@
  *
  */
 
-#include "core/function/GpgKeyGetter.h"
+#include "GpgKeyGetter.h"
 
 #include <gpg-error.h>
 
diff --git a/src/core/function/GpgKeyGetter.h b/src/core/function/gpg/GpgKeyGetter.h
index cde027a0..cde027a0 100644
--- a/src/core/function/GpgKeyGetter.h
+++ b/src/core/function/gpg/GpgKeyGetter.h
diff --git a/src/core/function/GpgKeyImportExporter.cpp b/src/core/function/gpg/GpgKeyImportExporter.cpp
index 441eae96..0f1ebfa2 100644
--- a/src/core/function/GpgKeyImportExporter.cpp
+++ b/src/core/function/gpg/GpgKeyImportExporter.cpp
@@ -26,10 +26,10 @@
  *
  */
 
-#include "core/function/GpgKeyImportExporter.h"
+#include "GpgKeyImportExporter.h"
 
 #include "GpgConstants.h"
-#include "core/function/GpgKeyGetter.h"
+#include "GpgKeyGetter.h"
 
 /**
  * Import key pair
diff --git a/src/core/function/GpgKeyImportExporter.h b/src/core/function/gpg/GpgKeyImportExporter.h
index d7e6deae..d7e6deae 100644
--- a/src/core/function/GpgKeyImportExporter.h
+++ b/src/core/function/gpg/GpgKeyImportExporter.h
diff --git a/src/core/function/GpgKeyManager.cpp b/src/core/function/gpg/GpgKeyManager.cpp
index 0c554c7c..c17df49e 100644
--- a/src/core/function/GpgKeyManager.cpp
+++ b/src/core/function/gpg/GpgKeyManager.cpp
@@ -26,13 +26,13 @@
  *
  */
 
-#include "core/function/GpgKeyManager.h"
+#include "GpgKeyManager.h"
 
 #include <boost/date_time/posix_time/conversion.hpp>
 #include <string>
 
-#include "core/function/GpgBasicOperator.h"
-#include "core/function/GpgKeyGetter.h"
+#include "GpgBasicOperator.h"
+#include "GpgKeyGetter.h"
 
 bool GpgFrontend::GpgKeyManager::SignKey(
     const GpgFrontend::GpgKey& target, GpgFrontend::KeyArgsList& keys,
diff --git a/src/core/function/GpgKeyManager.h b/src/core/function/gpg/GpgKeyManager.h
index 5bcac545..5bcac545 100644
--- a/src/core/function/GpgKeyManager.h
+++ b/src/core/function/gpg/GpgKeyManager.h
diff --git a/src/core/function/GpgKeyOpera.cpp b/src/core/function/gpg/GpgKeyOpera.cpp
index 4d7280b4..23dcae9f 100644
--- a/src/core/function/GpgKeyOpera.cpp
+++ b/src/core/function/gpg/GpgKeyOpera.cpp
@@ -26,7 +26,7 @@
  *
  */
 
-#include "core/function/GpgKeyOpera.h"
+#include "GpgKeyOpera.h"
 
 #include <boost/asio.hpp>
 #include <boost/date_time/posix_time/conversion.hpp>
@@ -38,8 +38,8 @@
 
 #include "core/GpgConstants.h"
 #include "core/GpgGenKeyInfo.h"
-#include "core/function/GpgCommandExecutor.h"
-#include "core/function/GpgKeyGetter.h"
+#include "GpgCommandExecutor.h"
+#include "GpgKeyGetter.h"
 
 /**
  * Delete keys
diff --git a/src/core/function/GpgKeyOpera.h b/src/core/function/gpg/GpgKeyOpera.h
index 04571c10..04571c10 100644
--- a/src/core/function/GpgKeyOpera.h
+++ b/src/core/function/gpg/GpgKeyOpera.h
diff --git a/src/core/function/GpgUIDOperator.cpp b/src/core/function/gpg/GpgUIDOperator.cpp
index 405c3c87..dd0c43f6 100644
--- a/src/core/function/GpgUIDOperator.cpp
+++ b/src/core/function/gpg/GpgUIDOperator.cpp
@@ -26,7 +26,7 @@
  *
  */
 
-#include "core/function/GpgUIDOperator.h"
+#include "GpgUIDOperator.h"
 
 #include "boost/format.hpp"
 
diff --git a/src/core/function/GpgUIDOperator.h b/src/core/function/gpg/GpgUIDOperator.h
index 479505e5..479505e5 100644
--- a/src/core/function/GpgUIDOperator.h
+++ b/src/core/function/gpg/GpgUIDOperator.h
diff --git a/src/core/result_analyse/GpgDecryptResultAnalyse.cpp b/src/core/function/result_analyse/GpgDecryptResultAnalyse.cpp
index 6bf469e0..ff3d2e27 100644
--- a/src/core/result_analyse/GpgDecryptResultAnalyse.cpp
+++ b/src/core/function/result_analyse/GpgDecryptResultAnalyse.cpp
@@ -26,9 +26,9 @@
  *
  */
 
-#include "core/result_analyse/GpgDecryptResultAnalyse.h"
+#include "GpgDecryptResultAnalyse.h"
 
-#include "core/function/GpgKeyGetter.h"
+#include "function/gpg/GpgKeyGetter.h"
 
 GpgFrontend::GpgDecryptResultAnalyse::GpgDecryptResultAnalyse(GpgError m_error,
                                                         GpgDecrResult m_result)
diff --git a/src/core/result_analyse/GpgDecryptResultAnalyse.h b/src/core/function/result_analyse/GpgDecryptResultAnalyse.h
index af42f995..af42f995 100644
--- a/src/core/result_analyse/GpgDecryptResultAnalyse.h
+++ b/src/core/function/result_analyse/GpgDecryptResultAnalyse.h
diff --git a/src/core/result_analyse/GpgEncryptResultAnalyse.cpp b/src/core/function/result_analyse/GpgEncryptResultAnalyse.cpp
index 4249fc9c..053a15a5 100644
--- a/src/core/result_analyse/GpgEncryptResultAnalyse.cpp
+++ b/src/core/function/result_analyse/GpgEncryptResultAnalyse.cpp
@@ -26,7 +26,7 @@
  *
  */
 
-#include "core/result_analyse/GpgEncryptResultAnalyse.h"
+#include "GpgEncryptResultAnalyse.h"
 
 GpgFrontend::GpgEncryptResultAnalyse::GpgEncryptResultAnalyse(GpgError error,
                                                         GpgEncrResult result)
diff --git a/src/core/result_analyse/GpgEncryptResultAnalyse.h b/src/core/function/result_analyse/GpgEncryptResultAnalyse.h
index c5125fdc..c5125fdc 100644
--- a/src/core/result_analyse/GpgEncryptResultAnalyse.h
+++ b/src/core/function/result_analyse/GpgEncryptResultAnalyse.h
diff --git a/src/core/result_analyse/GpgResultAnalyse.cpp b/src/core/function/result_analyse/GpgResultAnalyse.cpp
index 250d73a7..40ba4c3e 100644
--- a/src/core/result_analyse/GpgResultAnalyse.cpp
+++ b/src/core/function/result_analyse/GpgResultAnalyse.cpp
@@ -26,7 +26,7 @@
  *
  */
 
-#include "core/result_analyse/GpgResultAnalyse.h"
+#include "GpgResultAnalyse.h"
 
 const std::string GpgFrontend::GpgResultAnalyse::GetResultReport() const {
   return stream_.str();
diff --git a/src/core/result_analyse/GpgResultAnalyse.h b/src/core/function/result_analyse/GpgResultAnalyse.h
index 888c6449..888c6449 100644
--- a/src/core/result_analyse/GpgResultAnalyse.h
+++ b/src/core/function/result_analyse/GpgResultAnalyse.h
diff --git a/src/core/result_analyse/GpgSignResultAnalyse.cpp b/src/core/function/result_analyse/GpgSignResultAnalyse.cpp
index 346dc706..e389523c 100644
--- a/src/core/result_analyse/GpgSignResultAnalyse.cpp
+++ b/src/core/function/result_analyse/GpgSignResultAnalyse.cpp
@@ -26,9 +26,9 @@
  *
  */
 
-#include "core/result_analyse/GpgSignResultAnalyse.h"
+#include "GpgSignResultAnalyse.h"
 
-#include "core/function/GpgKeyGetter.h"
+#include "function/gpg/GpgKeyGetter.h"
 
 GpgFrontend::GpgSignResultAnalyse::GpgSignResultAnalyse(GpgError error,
                                                   GpgSignResult result)
diff --git a/src/core/result_analyse/GpgSignResultAnalyse.h b/src/core/function/result_analyse/GpgSignResultAnalyse.h
index d593b33d..d593b33d 100644
--- a/src/core/result_analyse/GpgSignResultAnalyse.h
+++ b/src/core/function/result_analyse/GpgSignResultAnalyse.h
diff --git a/src/core/result_analyse/GpgVerifyResultAnalyse.cpp b/src/core/function/result_analyse/GpgVerifyResultAnalyse.cpp
index 48662ef2..44031e67 100644
--- a/src/core/result_analyse/GpgVerifyResultAnalyse.cpp
+++ b/src/core/function/result_analyse/GpgVerifyResultAnalyse.cpp
@@ -26,13 +26,13 @@
  *
  */
 
-#include "core/result_analyse/GpgVerifyResultAnalyse.h"
+#include "GpgVerifyResultAnalyse.h"
 
 #include <boost/format.hpp>
 
 #include "GpgFrontend.h"
 #include "core/GpgConstants.h"
-#include "core/function/GpgKeyGetter.h"
+#include "function/gpg/GpgKeyGetter.h"
 
 GpgFrontend::GpgVerifyResultAnalyse::GpgVerifyResultAnalyse(GpgError error,
                                                       GpgVerifyResult result)
diff --git a/src/core/result_analyse/GpgVerifyResultAnalyse.h b/src/core/function/result_analyse/GpgVerifyResultAnalyse.h
index 12e4b7ff..12e4b7ff 100644
--- a/src/core/result_analyse/GpgVerifyResultAnalyse.h
+++ b/src/core/function/result_analyse/GpgVerifyResultAnalyse.h
diff --git a/src/ui/KeyMgmt.cpp b/src/ui/KeyMgmt.cpp
index 58b716ab..070ecd7f 100755
--- a/src/ui/KeyMgmt.cpp
+++ b/src/ui/KeyMgmt.cpp
@@ -30,10 +30,10 @@
 
 #include <utility>
 
-#include "core/function/GpgKeyGetter.h"
-#include "core/function/GpgKeyImportExporter.h"
-#include "core/function/GpgKeyOpera.h"
-#include "core/key_package/KeyPackageOperator.h"
+#include "core/function/gpg/GpgKeyGetter.h"
+#include "core/function/gpg/GpgKeyImportExporter.h"
+#include "core/function/gpg/GpgKeyOpera.h"
+#include "core/function/KeyPackageOperator.h"
 #include "ui/SignalStation.h"
 #include "ui/UserInterfaceUtils.h"
 #include "ui/import_export/ExportKeyPackageDialog.h"
diff --git a/src/ui/UserInterfaceUtils.cpp b/src/ui/UserInterfaceUtils.cpp
index ab81242d..8e2b0b18 100644
--- a/src/ui/UserInterfaceUtils.cpp
+++ b/src/ui/UserInterfaceUtils.cpp
@@ -30,8 +30,8 @@
 
 #include <utility>
 
-#include "core/file/FileOperator.h"
-#include "core/result_analyse/GpgResultAnalyse.h"
+#include "core/function/FileOperator.h"
+#include "core/function/result_analyse/GpgResultAnalyse.h"
 #include "ui/SignalStation.h"
 #include "ui/dialog/WaitingDialog.h"
 #include "ui/mail/SendMailDialog.h"
diff --git a/src/ui/UserInterfaceUtils.h b/src/ui/UserInterfaceUtils.h
index ab5200a6..9d73e9b5 100644
--- a/src/ui/UserInterfaceUtils.h
+++ b/src/ui/UserInterfaceUtils.h
@@ -30,7 +30,7 @@
 #define GPGFRONTEND_USER_INTERFACE_UTILS_H
 
 #include "core/GpgModel.h"
-#include "core/result_analyse/GpgVerifyResultAnalyse.h"
+#include "core/function/result_analyse/GpgVerifyResultAnalyse.h"
 #include "ui/GpgFrontendUI.h"
 
 namespace GpgFrontend {
diff --git a/src/ui/import_export/ExportKeyPackageDialog.cpp b/src/ui/import_export/ExportKeyPackageDialog.cpp
index d813d12c..d6f303f6 100644
--- a/src/ui/import_export/ExportKeyPackageDialog.cpp
+++ b/src/ui/import_export/ExportKeyPackageDialog.cpp
@@ -30,8 +30,8 @@
 
 #include <boost/format.hpp>
 
-#include "core/function/GpgKeyGetter.h"
-#include "core/key_package/KeyPackageOperator.h"
+#include "core/function/gpg/GpgKeyGetter.h"
+#include "core/function/KeyPackageOperator.h"
 #include "ui_ExportKeyPackageDialog.h"
 
 GpgFrontend::UI::ExportKeyPackageDialog::ExportKeyPackageDialog(
diff --git a/src/ui/import_export/KeyImportDetailDialog.cpp b/src/ui/import_export/KeyImportDetailDialog.cpp
index 326e3034..766d2d81 100644
--- a/src/ui/import_export/KeyImportDetailDialog.cpp
+++ b/src/ui/import_export/KeyImportDetailDialog.cpp
@@ -28,7 +28,7 @@
 
 #include "KeyImportDetailDialog.h"
 
-#include "core/function/GpgKeyGetter.h"
+#include "core/function/gpg/GpgKeyGetter.h"
 
 namespace GpgFrontend::UI {
 KeyImportDetailDialog::KeyImportDetailDialog(GpgImportInformation result,
diff --git a/src/ui/import_export/KeyImportDetailDialog.h b/src/ui/import_export/KeyImportDetailDialog.h
index 860cfa8d..a648f205 100644
--- a/src/ui/import_export/KeyImportDetailDialog.h
+++ b/src/ui/import_export/KeyImportDetailDialog.h
@@ -30,7 +30,7 @@
 #define __KEYIMPORTDETAILSDIALOG_H__
 
 #include "core/GpgContext.h"
-#include "core/function/GpgKeyImportExporter.h"
+#include "core/function/gpg/GpgKeyImportExporter.h"
 #include "ui/GpgFrontendUI.h"
 
 namespace GpgFrontend::UI {
diff --git a/src/ui/import_export/KeyServerImportDialog.cpp b/src/ui/import_export/KeyServerImportDialog.cpp
index 3ea4adc4..59323e42 100644
--- a/src/ui/import_export/KeyServerImportDialog.cpp
+++ b/src/ui/import_export/KeyServerImportDialog.cpp
@@ -30,7 +30,7 @@
 
 #include <utility>
 
-#include "core/function/GpgKeyImportExporter.h"
+#include "core/function/gpg/GpgKeyImportExporter.h"
 #include "ui/SignalStation.h"
 #include "ui/settings/GlobalSettingStation.h"
 
diff --git a/src/ui/import_export/KeyUploadDialog.cpp b/src/ui/import_export/KeyUploadDialog.cpp
index d991b856..ce6c8fed 100644
--- a/src/ui/import_export/KeyUploadDialog.cpp
+++ b/src/ui/import_export/KeyUploadDialog.cpp
@@ -30,8 +30,8 @@
 
 #include <algorithm>
 
-#include "core/function/GpgKeyGetter.h"
-#include "core/function/GpgKeyImportExporter.h"
+#include "core/function/gpg/GpgKeyGetter.h"
+#include "core/function/gpg/GpgKeyImportExporter.h"
 #include "ui/settings/GlobalSettingStation.h"
 
 namespace GpgFrontend::UI {
diff --git a/src/ui/key_generate/KeygenDialog.cpp b/src/ui/key_generate/KeygenDialog.cpp
index 06fa79a5..826a00af 100644
--- a/src/ui/key_generate/KeygenDialog.cpp
+++ b/src/ui/key_generate/KeygenDialog.cpp
@@ -29,7 +29,7 @@
 #include "ui/key_generate/KeygenDialog.h"
 
 #include "dialog/WaitingDialog.h"
-#include "core/function/GpgKeyOpera.h"
+#include "core/function/gpg/GpgKeyOpera.h"
 #include "ui/SignalStation.h"
 #include "ui/settings/GlobalSettingStation.h"
 
diff --git a/src/ui/key_generate/SubkeyGenerateDialog.cpp b/src/ui/key_generate/SubkeyGenerateDialog.cpp
index b593b1f9..829fc62d 100644
--- a/src/ui/key_generate/SubkeyGenerateDialog.cpp
+++ b/src/ui/key_generate/SubkeyGenerateDialog.cpp
@@ -27,8 +27,8 @@
 #include "ui/key_generate/SubkeyGenerateDialog.h"
 
 #include "dialog/WaitingDialog.h"
-#include "core/function/GpgKeyGetter.h"
-#include "core/function/GpgKeyOpera.h"
+#include "core/function/gpg/GpgKeyGetter.h"
+#include "core/function/gpg/GpgKeyOpera.h"
 #include "ui/SignalStation.h"
 #include "ui/settings/GlobalSettingStation.h"
 
diff --git a/src/ui/keypair_details/KeyNewUIDDialog.cpp b/src/ui/keypair_details/KeyNewUIDDialog.cpp
index 78f2badc..9ff73f9e 100644
--- a/src/ui/keypair_details/KeyNewUIDDialog.cpp
+++ b/src/ui/keypair_details/KeyNewUIDDialog.cpp
@@ -26,8 +26,8 @@
 
 #include "ui/keypair_details/KeyNewUIDDialog.h"
 
-#include "core/function/GpgKeyGetter.h"
-#include "core/function/GpgUIDOperator.h"
+#include "core/function/gpg/GpgKeyGetter.h"
+#include "core/function/gpg/GpgUIDOperator.h"
 #include "ui/SignalStation.h"
 
 namespace GpgFrontend::UI {
diff --git a/src/ui/keypair_details/KeyPairDetailTab.cpp b/src/ui/keypair_details/KeyPairDetailTab.cpp
index 84de4d92..6174e67b 100644
--- a/src/ui/keypair_details/KeyPairDetailTab.cpp
+++ b/src/ui/keypair_details/KeyPairDetailTab.cpp
@@ -27,8 +27,8 @@
 #include "ui/keypair_details/KeyPairDetailTab.h"
 
 #include "dialog/WaitingDialog.h"
-#include "core/function/GpgKeyGetter.h"
-#include "core/function/GpgKeyImportExporter.h"
+#include "core/function/gpg/GpgKeyGetter.h"
+#include "core/function/gpg/GpgKeyImportExporter.h"
 #include "ui/SignalStation.h"
 
 namespace GpgFrontend::UI {
diff --git a/src/ui/keypair_details/KeyPairOperaTab.cpp b/src/ui/keypair_details/KeyPairOperaTab.cpp
index 6a25cc57..988ce527 100644
--- a/src/ui/keypair_details/KeyPairOperaTab.cpp
+++ b/src/ui/keypair_details/KeyPairOperaTab.cpp
@@ -26,8 +26,8 @@
 
 #include "KeyPairOperaTab.h"
 
-#include "core/function/GpgKeyImportExporter.h"
-#include "core/function/GpgKeyOpera.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"
diff --git a/src/ui/keypair_details/KeyPairOperaTab.h b/src/ui/keypair_details/KeyPairOperaTab.h
index 74bdce0d..af6b1eee 100644
--- a/src/ui/keypair_details/KeyPairOperaTab.h
+++ b/src/ui/keypair_details/KeyPairOperaTab.h
@@ -27,7 +27,7 @@
 #ifndef GPGFRONTEND_KEYPAIROPERATAB_H
 #define GPGFRONTEND_KEYPAIROPERATAB_H
 
-#include "core/function/GpgKeyGetter.h"
+#include "core/function/gpg/GpgKeyGetter.h"
 #include "ui/GpgFrontendUI.h"
 
 namespace GpgFrontend::UI {
diff --git a/src/ui/keypair_details/KeyPairSubkeyTab.cpp b/src/ui/keypair_details/KeyPairSubkeyTab.cpp
index bb41db2b..067ce110 100644
--- a/src/ui/keypair_details/KeyPairSubkeyTab.cpp
+++ b/src/ui/keypair_details/KeyPairSubkeyTab.cpp
@@ -28,7 +28,7 @@
 
 #include "ui/keypair_details/KeyPairSubkeyTab.h"
 
-#include "core/function/GpgKeyGetter.h"
+#include "core/function/gpg/GpgKeyGetter.h"
 #include "ui/SignalStation.h"
 
 namespace GpgFrontend::UI {
diff --git a/src/ui/keypair_details/KeyPairUIDTab.cpp b/src/ui/keypair_details/KeyPairUIDTab.cpp
index 026ca1bd..81d34684 100644
--- a/src/ui/keypair_details/KeyPairUIDTab.cpp
+++ b/src/ui/keypair_details/KeyPairUIDTab.cpp
@@ -26,9 +26,9 @@
 
 #include "ui/keypair_details/KeyPairUIDTab.h"
 
-#include "core/function/GpgKeyGetter.h"
-#include "core/function/GpgKeyManager.h"
-#include "core/function/GpgUIDOperator.h"
+#include "core/function/gpg/GpgKeyGetter.h"
+#include "core/function/gpg/GpgKeyManager.h"
+#include "core/function/gpg/GpgUIDOperator.h"
 #include "ui/SignalStation.h"
 #include "ui/widgets/TOFUInfoPage.h"
 
diff --git a/src/ui/keypair_details/KeySetExpireDateDialog.cpp b/src/ui/keypair_details/KeySetExpireDateDialog.cpp
index e69c6783..62d2f095 100644
--- a/src/ui/keypair_details/KeySetExpireDateDialog.cpp
+++ b/src/ui/keypair_details/KeySetExpireDateDialog.cpp
@@ -30,8 +30,8 @@
 
 #include <utility>
 
-#include "core/function/GpgKeyGetter.h"
-#include "core/function/GpgKeyOpera.h"
+#include "core/function/gpg/GpgKeyGetter.h"
+#include "core/function/gpg/GpgKeyOpera.h"
 #include "ui/SignalStation.h"
 #include "ui/settings/GlobalSettingStation.h"
 #include "ui_ModifiedExpirationDateTime.h"
diff --git a/src/ui/keypair_details/KeyUIDSignDialog.cpp b/src/ui/keypair_details/KeyUIDSignDialog.cpp
index 15abba9e..2ed45512 100644
--- a/src/ui/keypair_details/KeyUIDSignDialog.cpp
+++ b/src/ui/keypair_details/KeyUIDSignDialog.cpp
@@ -26,8 +26,8 @@
 
 #include "ui/keypair_details/KeyUIDSignDialog.h"
 
-#include "core/function/GpgKeyGetter.h"
-#include "core/function/GpgKeyManager.h"
+#include "core/function/gpg/GpgKeyGetter.h"
+#include "core/function/gpg/GpgKeyManager.h"
 #include "ui/SignalStation.h"
 
 namespace GpgFrontend::UI {
diff --git a/src/ui/mail/SendMailDialog.cpp b/src/ui/mail/SendMailDialog.cpp
index 215f1629..cf343f24 100644
--- a/src/ui/mail/SendMailDialog.cpp
+++ b/src/ui/mail/SendMailDialog.cpp
@@ -28,7 +28,7 @@
 
 #include "SendMailDialog.h"
 
-#include "core/function/GpgKeyGetter.h"
+#include "core/function/gpg/GpgKeyGetter.h"
 #include "ui/mail/EmailListEditor.h"
 #include "ui/mail/RecipientsPicker.h"
 #include "ui/mail/SenderPicker.h"
diff --git a/src/ui/main_window/MainWindow.h b/src/ui/main_window/MainWindow.h
index e8ecfedd..cfae16ab 100644
--- a/src/ui/main_window/MainWindow.h
+++ b/src/ui/main_window/MainWindow.h
@@ -30,9 +30,9 @@
 #define __GPGWIN_H__
 
 #include "core/GpgConstants.h"
-#include "core/result_analyse/GpgDecryptResultAnalyse.h"
-#include "core/result_analyse/GpgEncryptResultAnalyse.h"
-#include "core/result_analyse/GpgSignResultAnalyse.h"
+#include "core/function/result_analyse/GpgDecryptResultAnalyse.h"
+#include "core/function/result_analyse/GpgEncryptResultAnalyse.h"
+#include "core/function/result_analyse/GpgSignResultAnalyse.h"
 #include "ui/GpgFrontendUI.h"
 #include "ui/KeyMgmt.h"
 #include "ui/dialog/WaitingDialog.h"
diff --git a/src/ui/main_window/MainWindowFileSlotFunction.cpp b/src/ui/main_window/MainWindowFileSlotFunction.cpp
index 39d772a8..31a79297 100644
--- a/src/ui/main_window/MainWindowFileSlotFunction.cpp
+++ b/src/ui/main_window/MainWindowFileSlotFunction.cpp
@@ -27,8 +27,8 @@
  */
 
 #include "MainWindow.h"
-#include "core/function/GpgFileOpera.h"
-#include "core/function/GpgKeyGetter.h"
+#include "core/function/gpg/GpgFileOpera.h"
+#include "core/function/gpg/GpgKeyGetter.h"
 #include "ui/UserInterfaceUtils.h"
 #include "ui/settings/GlobalSettingStation.h"
 #include "ui/widgets/SignersPicker.h"
diff --git a/src/ui/main_window/MainWindowSlotFunction.cpp b/src/ui/main_window/MainWindowSlotFunction.cpp
index 0c389901..1dc58f5b 100644
--- a/src/ui/main_window/MainWindowSlotFunction.cpp
+++ b/src/ui/main_window/MainWindowSlotFunction.cpp
@@ -39,9 +39,9 @@
 #include "ui/mail/SendMailDialog.h"
 #endif
 
-#include "core/function/GpgBasicOperator.h"
-#include "core/function/GpgKeyGetter.h"
-#include "core/function/GpgKeyImportExporter.h"
+#include "core/function/gpg/GpgBasicOperator.h"
+#include "core/function/gpg/GpgKeyGetter.h"
+#include "core/function/gpg/GpgKeyImportExporter.h"
 #include "ui/UserInterfaceUtils.h"
 #include "ui/help/AboutDialog.h"
 #include "ui/settings/GlobalSettingStation.h"
diff --git a/src/ui/settings/GlobalSettingStation.cpp b/src/ui/settings/GlobalSettingStation.cpp
index ee1a9351..6f1dbaf7 100644
--- a/src/ui/settings/GlobalSettingStation.cpp
+++ b/src/ui/settings/GlobalSettingStation.cpp
@@ -34,7 +34,7 @@
 #include <vmime/security/cert/openssl/X509Certificate_OpenSSL.hpp>
 #include <vmime/vmime.hpp>
 
-#include "core/file/FileOperator.h"
+#include "core/function/FileOperator.h"
 
 std::unique_ptr<GpgFrontend::UI::GlobalSettingStation>
     GpgFrontend::UI::GlobalSettingStation::instance_ = nullptr;
diff --git a/src/ui/thread/CtxCheckThread.cpp b/src/ui/thread/CtxCheckThread.cpp
index bc180ae8..b1e50b94 100644
--- a/src/ui/thread/CtxCheckThread.cpp
+++ b/src/ui/thread/CtxCheckThread.cpp
@@ -28,7 +28,7 @@
 
 #include "core/GpgContext.h"
 #include "core/GpgCoreInit.h"
-#include "core/function/GpgKeyGetter.h"
+#include "core/function/gpg/GpgKeyGetter.h"
 #include "ui/UserInterfaceUtils.h"
 
 GpgFrontend::UI::CtxCheckThread::CtxCheckThread() : QThread(nullptr) {
diff --git a/src/ui/thread/SMTPSendMailThread.cpp b/src/ui/thread/SMTPSendMailThread.cpp
index 8ae31bb8..f1cb1626 100644
--- a/src/ui/thread/SMTPSendMailThread.cpp
+++ b/src/ui/thread/SMTPSendMailThread.cpp
@@ -28,9 +28,9 @@
 
 #include <boost/format.hpp>
 
-#include "core/function/GpgBasicOperator.h"
-#include "core/function/GpgKeyGetter.h"
-#include "core/function/GpgKeyImportExporter.h"
+#include "core/function/gpg/GpgBasicOperator.h"
+#include "core/function/gpg/GpgKeyGetter.h"
+#include "core/function/gpg/GpgKeyImportExporter.h"
 
 namespace GpgFrontend::UI {
 
diff --git a/src/ui/widgets/InfoBoardWidget.h b/src/ui/widgets/InfoBoardWidget.h
index 51ef1cf5..7f456777 100644
--- a/src/ui/widgets/InfoBoardWidget.h
+++ b/src/ui/widgets/InfoBoardWidget.h
@@ -30,7 +30,7 @@
 #define __VERIFYNOTIFICATION_H__
 
 #include "PlainTextEditorPage.h"
-#include "core/result_analyse/GpgVerifyResultAnalyse.h"
+#include "core/function/result_analyse/GpgVerifyResultAnalyse.h"
 #include "ui/details/VerifyDetailsDialog.h"
 
 class Ui_InfoBoard;
diff --git a/src/ui/widgets/KeyList.cpp b/src/ui/widgets/KeyList.cpp
index b8894e03..38d9d359 100644
--- a/src/ui/widgets/KeyList.cpp
+++ b/src/ui/widgets/KeyList.cpp
@@ -32,7 +32,7 @@
 #include <utility>
 
 #include "core/GpgCoreInit.h"
-#include "core/function/GpgKeyGetter.h"
+#include "core/function/gpg/GpgKeyGetter.h"
 #include "ui/SignalStation.h"
 #include "ui/UserInterfaceUtils.h"
 #include "ui/settings/GlobalSettingStation.h"
diff --git a/src/ui/widgets/VerifyKeyDetailBox.cpp b/src/ui/widgets/VerifyKeyDetailBox.cpp
index 1bb827d1..4c936f4f 100644
--- a/src/ui/widgets/VerifyKeyDetailBox.cpp
+++ b/src/ui/widgets/VerifyKeyDetailBox.cpp
@@ -28,7 +28,7 @@
 
 #include "ui/widgets/VerifyKeyDetailBox.h"
 
-#include "core/function/GpgKeyGetter.h"
+#include "core/function/gpg/GpgKeyGetter.h"
 
 namespace GpgFrontend::UI {