<refactor>(src): rename the gpg directory to core

99 files changed, 178 insertions, 179 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c3be9ebe..45f28421 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -27,7 +27,7 @@
 
 if (GPG_CORE)
     message(STATUS "Build Gpg Core")
-    add_subdirectory(gpg)
+    add_subdirectory(core)
 endif ()
 
 if (UI_CORE)
diff --git a/src/gpg/GpgConstants.cpp b/src/core/GpgConstants.cpp
index dbcb7aee..838164d1 100644
--- a/src/gpg/GpgConstants.cpp
+++ b/src/core/GpgConstants.cpp
@@ -26,7 +26,7 @@
  *
  */
 
-#include "gpg/GpgConstants.h"
+#include "core/GpgConstants.h"
 
 #include <gpg-error.h>
 
diff --git a/src/gpg/GpgConstants.h b/src/core/GpgConstants.h
index 8c6977ac..8c6977ac 100644
--- a/src/gpg/GpgConstants.h
+++ b/src/core/GpgConstants.h
diff --git a/src/gpg/GpgContext.cpp b/src/core/GpgContext.cpp
index 7f6dc827..1897202f 100644
--- a/src/gpg/GpgContext.cpp
+++ b/src/core/GpgContext.cpp
@@ -26,7 +26,7 @@
  *
  */
 
-#include "gpg/GpgContext.h"
+#include "core/GpgContext.h"
 
 #include <gpg-error.h>
 #include <gpgme.h>
diff --git a/src/gpg/GpgContext.h b/src/core/GpgContext.h
index 7de6bcad..7de6bcad 100644
--- a/src/gpg/GpgContext.h
+++ b/src/core/GpgContext.h
diff --git a/src/gpg/GpgCoreInit.cpp b/src/core/GpgCoreInit.cpp
index 6d9963d6..6d9963d6 100644
--- a/src/gpg/GpgCoreInit.cpp
+++ b/src/core/GpgCoreInit.cpp
diff --git a/src/gpg/GpgCoreInit.h b/src/core/GpgCoreInit.h
index 5ac804da..5ac804da 100644
--- a/src/gpg/GpgCoreInit.h
+++ b/src/core/GpgCoreInit.h
diff --git a/src/gpg/GpgFunctionObject.h b/src/core/GpgFunctionObject.h
index 391b1585..391b1585 100644
--- a/src/gpg/GpgFunctionObject.h
+++ b/src/core/GpgFunctionObject.h
diff --git a/src/gpg/GpgGenKeyInfo.cpp b/src/core/GpgGenKeyInfo.cpp
index 75a6c77e..6ca83c96 100644
--- a/src/gpg/GpgGenKeyInfo.cpp
+++ b/src/core/GpgGenKeyInfo.cpp
@@ -26,7 +26,7 @@
  *
  */
 
-#include "gpg/GpgGenKeyInfo.h"
+#include "core/GpgGenKeyInfo.h"
 
 #include <boost/date_time/gregorian/greg_date.hpp>
 #include <boost/date_time/gregorian/greg_duration.hpp>
diff --git a/src/gpg/GpgGenKeyInfo.h b/src/core/GpgGenKeyInfo.h
index 59ced710..59ced710 100644
--- a/src/gpg/GpgGenKeyInfo.h
+++ b/src/core/GpgGenKeyInfo.h
diff --git a/src/gpg/GpgInfo.cpp b/src/core/GpgInfo.cpp
index cbcf984b..a77f0ed4 100644
--- a/src/gpg/GpgInfo.cpp
+++ b/src/core/GpgInfo.cpp
@@ -26,4 +26,4 @@
  *
  */
 
-#include "gpg/GpgInfo.h"
+#include "core/GpgInfo.h"
diff --git a/src/gpg/GpgInfo.h b/src/core/GpgInfo.h
index 71c5f9a9..71c5f9a9 100644
--- a/src/gpg/GpgInfo.h
+++ b/src/core/GpgInfo.h
diff --git a/src/gpg/GpgModel.h b/src/core/GpgModel.h
index 3cfc54d1..e3d43332 100644
--- a/src/gpg/GpgModel.h
+++ b/src/core/GpgModel.h
@@ -33,9 +33,9 @@
 #include <utility>
 
 #include "GpgConstants.h"
-#include "gpg/model/GpgData.h"
-#include "gpg/model/GpgKey.h"
-#include "gpg/model/GpgSignature.h"
+#include "core/model/GpgData.h"
+#include "core/model/GpgKey.h"
+#include "core/model/GpgSignature.h"
 
 namespace GpgFrontend {
 
diff --git a/src/gpg/function/GpgBasicOperator.cpp b/src/core/function/GpgBasicOperator.cpp
index cf331907..0fd13e33 100644
--- a/src/gpg/function/GpgBasicOperator.cpp
+++ b/src/core/function/GpgBasicOperator.cpp
@@ -26,11 +26,11 @@
  *
  */
 
-#include "gpg/function/GpgBasicOperator.h"
+#include "core/function/GpgBasicOperator.h"
 
 #include <vector>
 
-#include "gpg/function/GpgKeyGetter.h"
+#include "core/function/GpgKeyGetter.h"
 
 GpgFrontend::GpgError GpgFrontend::GpgBasicOperator::Encrypt(
     KeyListPtr keys, GpgFrontend::BypeArrayRef in_buffer,
diff --git a/src/gpg/function/GpgBasicOperator.h b/src/core/function/GpgBasicOperator.h
index d484fa9a..9b9d9f63 100644
--- a/src/gpg/function/GpgBasicOperator.h
+++ b/src/core/function/GpgBasicOperator.h
@@ -29,10 +29,10 @@
 #ifndef GPGFRONTEND_ZH_CN_TS_BASICOPERATOR_H
 #define GPGFRONTEND_ZH_CN_TS_BASICOPERATOR_H
 
-#include "gpg/GpgConstants.h"
-#include "gpg/GpgContext.h"
-#include "gpg/GpgFunctionObject.h"
-#include "gpg/GpgModel.h"
+#include "core/GpgConstants.h"
+#include "core/GpgContext.h"
+#include "core/GpgFunctionObject.h"
+#include "core/GpgModel.h"
 
 namespace GpgFrontend {
 
diff --git a/src/gpg/function/GpgCommandExecutor.cpp b/src/core/function/GpgCommandExecutor.cpp
index 08a4d677..0915b092 100644
--- a/src/gpg/function/GpgCommandExecutor.cpp
+++ b/src/core/function/GpgCommandExecutor.cpp
@@ -25,7 +25,7 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  */
-#include "gpg/function/GpgCommandExecutor.h"
+#include "core/function/GpgCommandExecutor.h"
 #ifndef WINDOWS
 #include <boost/asio.hpp>
 #endif
diff --git a/src/gpg/function/GpgCommandExecutor.h b/src/core/function/GpgCommandExecutor.h
index 63a1cf61..49baf406 100644
--- a/src/gpg/function/GpgCommandExecutor.h
+++ b/src/core/function/GpgCommandExecutor.h
@@ -33,8 +33,8 @@
 #include <boost/process.hpp>
 #endif
 
-#include "gpg/GpgContext.h"
-#include "gpg/GpgFunctionObject.h"
+#include "core/GpgContext.h"
+#include "core/GpgFunctionObject.h"
 
 namespace GpgFrontend {
 
diff --git a/src/gpg/function/GpgFileOpera.cpp b/src/core/function/GpgFileOpera.cpp
index f885f5b9..c9c4fc0e 100644
--- a/src/gpg/function/GpgFileOpera.cpp
+++ b/src/core/function/GpgFileOpera.cpp
@@ -25,13 +25,13 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  */
-#include "gpg/function/GpgFileOpera.h"
+#include "core/function/GpgFileOpera.h"
 
 #include <memory>
 #include <string>
 
 #include "GpgConstants.h"
-#include "gpg/function/GpgBasicOperator.h"
+#include "core/function/GpgBasicOperator.h"
 
 GpgFrontend::GpgError GpgFrontend::GpgFileOpera::EncryptFile(
     KeyListPtr keys, const std::string& in_path, const std::string& out_path,
diff --git a/src/gpg/function/GpgFileOpera.h b/src/core/function/GpgFileOpera.h
index 96c24329..f21bf04c 100644
--- a/src/gpg/function/GpgFileOpera.h
+++ b/src/core/function/GpgFileOpera.h
@@ -29,9 +29,9 @@
 #ifndef GPGFRONTEND_GPGFILEOPERA_H
 #define GPGFRONTEND_GPGFILEOPERA_H
 
-#include "gpg/GpgConstants.h"
-#include "gpg/GpgContext.h"
-#include "gpg/GpgModel.h"
+#include "core/GpgConstants.h"
+#include "core/GpgContext.h"
+#include "core/GpgModel.h"
 
 namespace GpgFrontend {
 
diff --git a/src/gpg/function/GpgKeyGetter.cpp b/src/core/function/GpgKeyGetter.cpp
index caab6fb2..604c4164 100644
--- a/src/gpg/function/GpgKeyGetter.cpp
+++ b/src/core/function/GpgKeyGetter.cpp
@@ -26,7 +26,7 @@
  *
  */
 
-#include "gpg/function/GpgKeyGetter.h"
+#include "core/function/GpgKeyGetter.h"
 
 #include <gpg-error.h>
 
diff --git a/src/gpg/function/GpgKeyGetter.h b/src/core/function/GpgKeyGetter.h
index 4c9829d5..cde027a0 100644
--- a/src/gpg/function/GpgKeyGetter.h
+++ b/src/core/function/GpgKeyGetter.h
@@ -29,9 +29,9 @@
 #ifndef GPGFRONTEND_ZH_CN_TS_GPGKEYGETTER_H
 #define GPGFRONTEND_ZH_CN_TS_GPGKEYGETTER_H
 
-#include "gpg/GpgContext.h"
-#include "gpg/GpgFunctionObject.h"
-#include "gpg/GpgModel.h"
+#include "core/GpgContext.h"
+#include "core/GpgFunctionObject.h"
+#include "core/GpgModel.h"
 
 namespace GpgFrontend {
 
diff --git a/src/gpg/function/GpgKeyImportExporter.cpp b/src/core/function/GpgKeyImportExporter.cpp
index 4f90bce4..441eae96 100644
--- a/src/gpg/function/GpgKeyImportExporter.cpp
+++ b/src/core/function/GpgKeyImportExporter.cpp
@@ -26,10 +26,10 @@
  *
  */
 
-#include "gpg/function/GpgKeyImportExporter.h"
+#include "core/function/GpgKeyImportExporter.h"
 
 #include "GpgConstants.h"
-#include "gpg/function/GpgKeyGetter.h"
+#include "core/function/GpgKeyGetter.h"
 
 /**
  * Import key pair
diff --git a/src/gpg/function/GpgKeyImportExporter.h b/src/core/function/GpgKeyImportExporter.h
index a3bc0e5b..d7e6deae 100644
--- a/src/gpg/function/GpgKeyImportExporter.h
+++ b/src/core/function/GpgKeyImportExporter.h
@@ -31,10 +31,10 @@
 
 #include <string>
 
-#include "gpg/GpgConstants.h"
-#include "gpg/GpgContext.h"
-#include "gpg/GpgFunctionObject.h"
-#include "gpg/GpgModel.h"
+#include "core/GpgConstants.h"
+#include "core/GpgContext.h"
+#include "core/GpgFunctionObject.h"
+#include "core/GpgModel.h"
 
 namespace GpgFrontend {
 
diff --git a/src/gpg/function/GpgKeyManager.cpp b/src/core/function/GpgKeyManager.cpp
index 448cbfe2..0c554c7c 100644
--- a/src/gpg/function/GpgKeyManager.cpp
+++ b/src/core/function/GpgKeyManager.cpp
@@ -26,13 +26,13 @@
  *
  */
 
-#include "gpg/function/GpgKeyManager.h"
+#include "core/function/GpgKeyManager.h"
 
 #include <boost/date_time/posix_time/conversion.hpp>
 #include <string>
 
-#include "gpg/function/GpgBasicOperator.h"
-#include "gpg/function/GpgKeyGetter.h"
+#include "core/function/GpgBasicOperator.h"
+#include "core/function/GpgKeyGetter.h"
 
 bool GpgFrontend::GpgKeyManager::SignKey(
     const GpgFrontend::GpgKey& target, GpgFrontend::KeyArgsList& keys,
diff --git a/src/gpg/function/GpgKeyManager.h b/src/core/function/GpgKeyManager.h
index 7d08c0bd..5bcac545 100644
--- a/src/gpg/function/GpgKeyManager.h
+++ b/src/core/function/GpgKeyManager.h
@@ -29,9 +29,9 @@
 #ifndef GPGFRONTEND_ZH_CN_TS_GPGKEYMANAGER_H
 #define GPGFRONTEND_ZH_CN_TS_GPGKEYMANAGER_H
 
-#include "gpg/GpgContext.h"
-#include "gpg/GpgFunctionObject.h"
-#include "gpg/GpgModel.h"
+#include "core/GpgContext.h"
+#include "core/GpgFunctionObject.h"
+#include "core/GpgModel.h"
 
 namespace GpgFrontend {
 
diff --git a/src/gpg/function/GpgKeyOpera.cpp b/src/core/function/GpgKeyOpera.cpp
index 212c75e6..4d7280b4 100644
--- a/src/gpg/function/GpgKeyOpera.cpp
+++ b/src/core/function/GpgKeyOpera.cpp
@@ -26,7 +26,7 @@
  *
  */
 
-#include "gpg/function/GpgKeyOpera.h"
+#include "core/function/GpgKeyOpera.h"
 
 #include <boost/asio.hpp>
 #include <boost/date_time/posix_time/conversion.hpp>
@@ -36,10 +36,10 @@
 #include <string>
 #include <vector>
 
-#include "gpg/GpgConstants.h"
-#include "gpg/GpgGenKeyInfo.h"
-#include "gpg/function/GpgCommandExecutor.h"
-#include "gpg/function/GpgKeyGetter.h"
+#include "core/GpgConstants.h"
+#include "core/GpgGenKeyInfo.h"
+#include "core/function/GpgCommandExecutor.h"
+#include "core/function/GpgKeyGetter.h"
 
 /**
  * Delete keys
diff --git a/src/gpg/function/GpgKeyOpera.h b/src/core/function/GpgKeyOpera.h
index 77759d38..04571c10 100644
--- a/src/gpg/function/GpgKeyOpera.h
+++ b/src/core/function/GpgKeyOpera.h
@@ -29,9 +29,9 @@
 #ifndef _GPGKEYOPERA_H
 #define _GPGKEYOPERA_H
 
-#include "gpg/GpgConstants.h"
-#include "gpg/GpgContext.h"
-#include "gpg/GpgModel.h"
+#include "core/GpgConstants.h"
+#include "core/GpgContext.h"
+#include "core/GpgModel.h"
 
 namespace GpgFrontend {
 /**
diff --git a/src/gpg/function/GpgUIDOperator.cpp b/src/core/function/GpgUIDOperator.cpp
index 4042eacc..405c3c87 100644
--- a/src/gpg/function/GpgUIDOperator.cpp
+++ b/src/core/function/GpgUIDOperator.cpp
@@ -26,7 +26,7 @@
  *
  */
 
-#include "gpg/function/GpgUIDOperator.h"
+#include "core/function/GpgUIDOperator.h"
 
 #include "boost/format.hpp"
 
diff --git a/src/gpg/function/GpgUIDOperator.h b/src/core/function/GpgUIDOperator.h
index 69fb288d..479505e5 100644
--- a/src/gpg/function/GpgUIDOperator.h
+++ b/src/core/function/GpgUIDOperator.h
@@ -29,8 +29,8 @@
 #ifndef GPGFRONTEND_ZH_CN_TS_UIDOPERATOR_H
 #define GPGFRONTEND_ZH_CN_TS_UIDOPERATOR_H
 
-#include "gpg/GpgContext.h"
-#include "gpg/GpgModel.h"
+#include "core/GpgContext.h"
+#include "core/GpgModel.h"
 
 namespace GpgFrontend {
 /**
diff --git a/src/gpg/model/GpgData.cpp b/src/core/model/GpgData.cpp
index b601c196..7fda4416 100644
--- a/src/gpg/model/GpgData.cpp
+++ b/src/core/model/GpgData.cpp
@@ -26,7 +26,7 @@
  *
  */
 
-#include "gpg/model/GpgData.h"
+#include "core/model/GpgData.h"
 
 GpgFrontend::GpgData::GpgData() {
   gpgme_data_t data;
diff --git a/src/gpg/model/GpgData.h b/src/core/model/GpgData.h
index e7739905..c06f78d6 100644
--- a/src/gpg/model/GpgData.h
+++ b/src/core/model/GpgData.h
@@ -29,7 +29,7 @@
 #ifndef _GPGDATA_H
 #define _GPGDATA_H
 
-#include "gpg/GpgConstants.h"
+#include "core/GpgConstants.h"
 
 namespace GpgFrontend {
 /**
diff --git a/src/gpg/model/GpgKey.cpp b/src/core/model/GpgKey.cpp
index 44a9ef2e..b0952cfa 100644
--- a/src/gpg/model/GpgKey.cpp
+++ b/src/core/model/GpgKey.cpp
@@ -26,7 +26,7 @@
  *
  */
 
-#include "gpg/model/GpgKey.h"
+#include "core/model/GpgKey.h"
 
 GpgFrontend::GpgKey::GpgKey(gpgme_key_t &&key) : key_ref_(std::move(key)) {}
 
diff --git a/src/gpg/model/GpgKey.h b/src/core/model/GpgKey.h
index 14315d4c..14315d4c 100644
--- a/src/gpg/model/GpgKey.h
+++ b/src/core/model/GpgKey.h
diff --git a/src/gpg/model/GpgKeySignature.cpp b/src/core/model/GpgKeySignature.cpp
index 750a140e..0c11a93b 100644
--- a/src/gpg/model/GpgKeySignature.cpp
+++ b/src/core/model/GpgKeySignature.cpp
@@ -26,7 +26,7 @@
  *
  */
 
-#include "gpg/model/GpgKeySignature.h"
+#include "core/model/GpgKeySignature.h"
 
 GpgFrontend::GpgKeySignature::GpgKeySignature(gpgme_key_sig_t sig)
     : signature_ref_(sig, [&](gpgme_key_sig_t signature) {}) {}
diff --git a/src/gpg/model/GpgKeySignature.h b/src/core/model/GpgKeySignature.h
index 9234e37f..33b84904 100644
--- a/src/gpg/model/GpgKeySignature.h
+++ b/src/core/model/GpgKeySignature.h
@@ -32,7 +32,7 @@
 #include <boost/date_time.hpp>
 #include <string>
 
-#include "gpg/GpgConstants.h"
+#include "core/GpgConstants.h"
 
 /**
  * @brief
diff --git a/src/gpg/model/GpgSignature.cpp b/src/core/model/GpgSignature.cpp
index f8084442..f8084442 100644
--- a/src/gpg/model/GpgSignature.cpp
+++ b/src/core/model/GpgSignature.cpp
diff --git a/src/gpg/model/GpgSignature.h b/src/core/model/GpgSignature.h
index d11348a6..942f0097 100644
--- a/src/gpg/model/GpgSignature.h
+++ b/src/core/model/GpgSignature.h
@@ -32,7 +32,7 @@
 #include <boost/date_time/gregorian/greg_date.hpp>
 #include <boost/date_time/posix_time/conversion.hpp>
 
-#include "gpg/GpgConstants.h"
+#include "core/GpgConstants.h"
 
 namespace GpgFrontend {
 
diff --git a/src/gpg/model/GpgSubKey.cpp b/src/core/model/GpgSubKey.cpp
index 66ff32e5..767f9c5d 100644
--- a/src/gpg/model/GpgSubKey.cpp
+++ b/src/core/model/GpgSubKey.cpp
@@ -25,7 +25,7 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *
  */
-#include "gpg/model/GpgSubKey.h"
+#include "core/model/GpgSubKey.h"
 
 GpgFrontend::GpgSubKey::GpgSubKey(gpgme_subkey_t subkey)
     : _subkey_ref(subkey, [&](gpgme_subkey_t subkey) {}) {}
diff --git a/src/gpg/model/GpgSubKey.h b/src/core/model/GpgSubKey.h
index b242aa6a..1aadcdac 100644
--- a/src/gpg/model/GpgSubKey.h
+++ b/src/core/model/GpgSubKey.h
@@ -32,7 +32,7 @@
 #include <boost/date_time.hpp>
 #include <string>
 
-#include "gpg/GpgConstants.h"
+#include "core/GpgConstants.h"
 
 namespace GpgFrontend {
 
diff --git a/src/gpg/model/GpgTOFUInfo.cpp b/src/core/model/GpgTOFUInfo.cpp
index 8c83b360..8c83b360 100644
--- a/src/gpg/model/GpgTOFUInfo.cpp
+++ b/src/core/model/GpgTOFUInfo.cpp
diff --git a/src/gpg/model/GpgTOFUInfo.h b/src/core/model/GpgTOFUInfo.h
index 61471a06..b2fea4cf 100644
--- a/src/gpg/model/GpgTOFUInfo.h
+++ b/src/core/model/GpgTOFUInfo.h
@@ -29,7 +29,7 @@
 #ifndef GPGFRONTEND_GPGTOFU_H
 #define GPGFRONTEND_GPGTOFU_H
 
-#include "gpg/GpgConstants.h"
+#include "core/GpgConstants.h"
 
 namespace GpgFrontend {
 /**
diff --git a/src/gpg/model/GpgUID.cpp b/src/core/model/GpgUID.cpp
index 390128c9..6d98c882 100644
--- a/src/gpg/model/GpgUID.cpp
+++ b/src/core/model/GpgUID.cpp
@@ -26,7 +26,7 @@
  *
  */
 
-#include "gpg/model/GpgUID.h"
+#include "core/model/GpgUID.h"
 
 GpgFrontend::GpgUID::GpgUID(gpgme_user_id_t uid)
     : uid_ref_(uid, [&](gpgme_user_id_t uid) {}) {}
\ No newline at end of file
diff --git a/src/gpg/model/GpgUID.h b/src/core/model/GpgUID.h
index 7f8daf98..7f8daf98 100644
--- a/src/gpg/model/GpgUID.h
+++ b/src/core/model/GpgUID.h
diff --git a/src/gpg/result_analyse/GpgDecryptResultAnalyse.cpp b/src/core/result_analyse/GpgDecryptResultAnalyse.cpp
index f75d66f8..6bf469e0 100644
--- a/src/gpg/result_analyse/GpgDecryptResultAnalyse.cpp
+++ b/src/core/result_analyse/GpgDecryptResultAnalyse.cpp
@@ -26,9 +26,9 @@
  *
  */
 
-#include "gpg/result_analyse/GpgDecryptResultAnalyse.h"
+#include "core/result_analyse/GpgDecryptResultAnalyse.h"
 
-#include "gpg/function/GpgKeyGetter.h"
+#include "core/function/GpgKeyGetter.h"
 
 GpgFrontend::GpgDecryptResultAnalyse::GpgDecryptResultAnalyse(GpgError m_error,
                                                         GpgDecrResult m_result)
diff --git a/src/gpg/result_analyse/GpgDecryptResultAnalyse.h b/src/core/result_analyse/GpgDecryptResultAnalyse.h
index f2b3537d..af42f995 100644
--- a/src/gpg/result_analyse/GpgDecryptResultAnalyse.h
+++ b/src/core/result_analyse/GpgDecryptResultAnalyse.h
@@ -30,7 +30,7 @@
 #define GPGFRONTEND_GPGDECRYPTRESULTANALYSE_H
 
 #include "GpgResultAnalyse.h"
-#include "gpg/GpgConstants.h"
+#include "core/GpgConstants.h"
 
 namespace GpgFrontend {
 
diff --git a/src/gpg/result_analyse/GpgEncryptResultAnalyse.cpp b/src/core/result_analyse/GpgEncryptResultAnalyse.cpp
index 46b5bc61..4249fc9c 100644
--- a/src/gpg/result_analyse/GpgEncryptResultAnalyse.cpp
+++ b/src/core/result_analyse/GpgEncryptResultAnalyse.cpp
@@ -26,7 +26,7 @@
  *
  */
 
-#include "gpg/result_analyse/GpgEncryptResultAnalyse.h"
+#include "core/result_analyse/GpgEncryptResultAnalyse.h"
 
 GpgFrontend::GpgEncryptResultAnalyse::GpgEncryptResultAnalyse(GpgError error,
                                                         GpgEncrResult result)
diff --git a/src/gpg/result_analyse/GpgEncryptResultAnalyse.h b/src/core/result_analyse/GpgEncryptResultAnalyse.h
index d942210b..c5125fdc 100644
--- a/src/gpg/result_analyse/GpgEncryptResultAnalyse.h
+++ b/src/core/result_analyse/GpgEncryptResultAnalyse.h
@@ -30,7 +30,7 @@
 #define GPGFRONTEND_GPGENCRYPTRESULTANALYSE_H
 
 #include "GpgResultAnalyse.h"
-#include "gpg/GpgConstants.h"
+#include "core/GpgConstants.h"
 
 namespace GpgFrontend {
 /**
diff --git a/src/gpg/result_analyse/GpgResultAnalyse.cpp b/src/core/result_analyse/GpgResultAnalyse.cpp
index 309446fe..250d73a7 100644
--- a/src/gpg/result_analyse/GpgResultAnalyse.cpp
+++ b/src/core/result_analyse/GpgResultAnalyse.cpp
@@ -26,7 +26,7 @@
  *
  */
 
-#include "gpg/result_analyse/GpgResultAnalyse.h"
+#include "core/result_analyse/GpgResultAnalyse.h"
 
 const std::string GpgFrontend::GpgResultAnalyse::GetResultReport() const {
   return stream_.str();
diff --git a/src/gpg/result_analyse/GpgResultAnalyse.h b/src/core/result_analyse/GpgResultAnalyse.h
index 00a1b402..888c6449 100644
--- a/src/gpg/result_analyse/GpgResultAnalyse.h
+++ b/src/core/result_analyse/GpgResultAnalyse.h
@@ -31,7 +31,7 @@
 #include <sstream>
 #include <string>
 
-#include "gpg/GpgConstants.h"
+#include "core/GpgConstants.h"
 namespace GpgFrontend {
 
 class GpgResultAnalyse {
diff --git a/src/gpg/result_analyse/GpgSignResultAnalyse.cpp b/src/core/result_analyse/GpgSignResultAnalyse.cpp
index b3b05435..346dc706 100644
--- a/src/gpg/result_analyse/GpgSignResultAnalyse.cpp
+++ b/src/core/result_analyse/GpgSignResultAnalyse.cpp
@@ -26,9 +26,9 @@
  *
  */
 
-#include "gpg/result_analyse/GpgSignResultAnalyse.h"
+#include "core/result_analyse/GpgSignResultAnalyse.h"
 
-#include "gpg/function/GpgKeyGetter.h"
+#include "core/function/GpgKeyGetter.h"
 
 GpgFrontend::GpgSignResultAnalyse::GpgSignResultAnalyse(GpgError error,
                                                   GpgSignResult result)
diff --git a/src/gpg/result_analyse/GpgSignResultAnalyse.h b/src/core/result_analyse/GpgSignResultAnalyse.h
index d593b33d..d593b33d 100644
--- a/src/gpg/result_analyse/GpgSignResultAnalyse.h
+++ b/src/core/result_analyse/GpgSignResultAnalyse.h
diff --git a/src/gpg/result_analyse/GpgVerifyResultAnalyse.cpp b/src/core/result_analyse/GpgVerifyResultAnalyse.cpp
index 64898df3..48662ef2 100644
--- a/src/gpg/result_analyse/GpgVerifyResultAnalyse.cpp
+++ b/src/core/result_analyse/GpgVerifyResultAnalyse.cpp
@@ -26,13 +26,13 @@
  *
  */
 
-#include "gpg/result_analyse/GpgVerifyResultAnalyse.h"
+#include "core/result_analyse/GpgVerifyResultAnalyse.h"
 
 #include <boost/format.hpp>
 
 #include "GpgFrontend.h"
-#include "gpg/GpgConstants.h"
-#include "gpg/function/GpgKeyGetter.h"
+#include "core/GpgConstants.h"
+#include "core/function/GpgKeyGetter.h"
 
 GpgFrontend::GpgVerifyResultAnalyse::GpgVerifyResultAnalyse(GpgError error,
                                                       GpgVerifyResult result)
diff --git a/src/gpg/result_analyse/GpgVerifyResultAnalyse.h b/src/core/result_analyse/GpgVerifyResultAnalyse.h
index a65863dc..12e4b7ff 100644
--- a/src/gpg/result_analyse/GpgVerifyResultAnalyse.h
+++ b/src/core/result_analyse/GpgVerifyResultAnalyse.h
@@ -30,7 +30,7 @@
 #define GPGFRONTEND_GPGVERIFYRESULTANALYSE_H
 
 #include "GpgResultAnalyse.h"
-#include "gpg/model/GpgKeySignature.h"
+#include "core/model/GpgKeySignature.h"
 
 namespace GpgFrontend {
 /**
diff --git a/src/main.cpp b/src/main.cpp
index 9a979364..949ec949 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -35,7 +35,7 @@
 #include <cstdlib>
 
 #include "GpgFrontendBuildInfo.h"
-#include "gpg/GpgFunctionObject.h"
+#include "core/GpgFunctionObject.h"
 #include "ui/main_window/MainWindow.h"
 #include "ui/thread/CtxCheckThread.h"
 
diff --git a/src/ui/GpgFrontendUI.h b/src/ui/GpgFrontendUI.h
index c8e8e3e8..1b271d1c 100644
--- a/src/ui/GpgFrontendUI.h
+++ b/src/ui/GpgFrontendUI.h
@@ -42,8 +42,8 @@
  * Project internal dependencies
  */
 #include "GpgFrontend.h"
-#include "gpg/GpgConstants.h"
-#include "gpg/GpgModel.h"
+#include "core/GpgConstants.h"
+#include "core/GpgModel.h"
 
 /**
  * 3rd party dependencies
diff --git a/src/ui/KeyMgmt.cpp b/src/ui/KeyMgmt.cpp
index a06c61ce..016ae5c6 100755
--- a/src/ui/KeyMgmt.cpp
+++ b/src/ui/KeyMgmt.cpp
@@ -30,9 +30,9 @@
 
 #include <utility>
 
-#include "gpg/function/GpgKeyGetter.h"
-#include "gpg/function/GpgKeyImportExporter.h"
-#include "gpg/function/GpgKeyOpera.h"
+#include "core/function/GpgKeyGetter.h"
+#include "core/function/GpgKeyImportExporter.h"
+#include "core/function/GpgKeyOpera.h"
 #include "ui/import_export/ExportKeyPackageDialog.h"
 #include "ui/SignalStation.h"
 #include "ui/UserInterfaceUtils.h"
diff --git a/src/ui/UserInterfaceUtils.cpp b/src/ui/UserInterfaceUtils.cpp
index 3b030fa3..2f085c21 100644
--- a/src/ui/UserInterfaceUtils.cpp
+++ b/src/ui/UserInterfaceUtils.cpp
@@ -31,7 +31,7 @@
 #include <utility>
 
 #include "dialog/WaitingDialog.h"
-#include "gpg/result_analyse/GpgResultAnalyse.h"
+#include "core/result_analyse/GpgResultAnalyse.h"
 #include "ui/SignalStation.h"
 #include "ui/mail/SendMailDialog.h"
 #include "ui/settings/GlobalSettingStation.h"
diff --git a/src/ui/UserInterfaceUtils.h b/src/ui/UserInterfaceUtils.h
index 83e94aa9..ab5200a6 100644
--- a/src/ui/UserInterfaceUtils.h
+++ b/src/ui/UserInterfaceUtils.h
@@ -29,8 +29,8 @@
 #ifndef GPGFRONTEND_USER_INTERFACE_UTILS_H
 #define GPGFRONTEND_USER_INTERFACE_UTILS_H
 
-#include "gpg/GpgModel.h"
-#include "gpg/result_analyse/GpgVerifyResultAnalyse.h"
+#include "core/GpgModel.h"
+#include "core/result_analyse/GpgVerifyResultAnalyse.h"
 #include "ui/GpgFrontendUI.h"
 
 namespace GpgFrontend {
diff --git a/src/ui/dialog/Wizard.h b/src/ui/dialog/Wizard.h
index 33a17b72..eb093550 100644
--- a/src/ui/dialog/Wizard.h
+++ b/src/ui/dialog/Wizard.h
@@ -29,7 +29,7 @@
 #ifndef WIZARD_H
 #define WIZARD_H
 
-#include "gpg/GpgConstants.h"
+#include "core/GpgConstants.h"
 #include "ui/GpgFrontendUI.h"
 #include "ui/KeyMgmt.h"
 #include "ui/key_generate/KeygenDialog.h"
diff --git a/src/ui/help/AboutDialog.h b/src/ui/help/AboutDialog.h
index 95ae8c7a..40d93f3e 100644
--- a/src/ui/help/AboutDialog.h
+++ b/src/ui/help/AboutDialog.h
@@ -29,7 +29,7 @@
 #ifndef __ABOUTDIALOG_H__
 #define __ABOUTDIALOG_H__
 
-#include "gpg/GpgContext.h"
+#include "core/GpgContext.h"
 #include "ui/GpgFrontendUI.h"
 #include "ui/struct/SoftwareVersion.h"
 
diff --git a/src/ui/import_export/ExportKeyPackageDialog.cpp b/src/ui/import_export/ExportKeyPackageDialog.cpp
index 1317c1e6..2b275fd3 100644
--- a/src/ui/import_export/ExportKeyPackageDialog.cpp
+++ b/src/ui/import_export/ExportKeyPackageDialog.cpp
@@ -30,8 +30,8 @@
 
 #include <boost/format.hpp>
 
-#include "gpg/function/GpgKeyGetter.h"
-#include "gpg/function/GpgKeyImportExporter.h"
+#include "core/function/GpgKeyGetter.h"
+#include "core/function/GpgKeyImportExporter.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 1cc8e400..326e3034 100644
--- a/src/ui/import_export/KeyImportDetailDialog.cpp
+++ b/src/ui/import_export/KeyImportDetailDialog.cpp
@@ -28,7 +28,7 @@
 
 #include "KeyImportDetailDialog.h"
 
-#include "gpg/function/GpgKeyGetter.h"
+#include "core/function/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 9b875089..860cfa8d 100644
--- a/src/ui/import_export/KeyImportDetailDialog.h
+++ b/src/ui/import_export/KeyImportDetailDialog.h
@@ -29,8 +29,8 @@
 #ifndef __KEYIMPORTDETAILSDIALOG_H__
 #define __KEYIMPORTDETAILSDIALOG_H__
 
-#include "gpg/GpgContext.h"
-#include "gpg/function/GpgKeyImportExporter.h"
+#include "core/GpgContext.h"
+#include "core/function/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 a5fabf8d..3ea4adc4 100644
--- a/src/ui/import_export/KeyServerImportDialog.cpp
+++ b/src/ui/import_export/KeyServerImportDialog.cpp
@@ -30,7 +30,7 @@
 
 #include <utility>
 
-#include "gpg/function/GpgKeyImportExporter.h"
+#include "core/function/GpgKeyImportExporter.h"
 #include "ui/SignalStation.h"
 #include "ui/settings/GlobalSettingStation.h"
 
diff --git a/src/ui/import_export/KeyServerImportDialog.h b/src/ui/import_export/KeyServerImportDialog.h
index f2619464..37362859 100644
--- a/src/ui/import_export/KeyServerImportDialog.h
+++ b/src/ui/import_export/KeyServerImportDialog.h
@@ -30,7 +30,7 @@
 #define __KEY_SERVER_IMPORT_DIALOG_H__
 
 #include "KeyImportDetailDialog.h"
-#include "gpg/GpgContext.h"
+#include "core/GpgContext.h"
 #include "ui/GpgFrontendUI.h"
 #include "ui/widgets/KeyList.h"
 
diff --git a/src/ui/import_export/KeyUploadDialog.cpp b/src/ui/import_export/KeyUploadDialog.cpp
index db12a9ac..d991b856 100644
--- a/src/ui/import_export/KeyUploadDialog.cpp
+++ b/src/ui/import_export/KeyUploadDialog.cpp
@@ -30,8 +30,8 @@
 
 #include <algorithm>
 
-#include "gpg/function/GpgKeyGetter.h"
-#include "gpg/function/GpgKeyImportExporter.h"
+#include "core/function/GpgKeyGetter.h"
+#include "core/function/GpgKeyImportExporter.h"
 #include "ui/settings/GlobalSettingStation.h"
 
 namespace GpgFrontend::UI {
diff --git a/src/ui/import_export/KeyUploadDialog.h b/src/ui/import_export/KeyUploadDialog.h
index b3e0e726..05cba083 100644
--- a/src/ui/import_export/KeyUploadDialog.h
+++ b/src/ui/import_export/KeyUploadDialog.h
@@ -29,7 +29,7 @@
 #ifndef GPGFRONTEND_KEYUPLOADWIDGET_H
 #define GPGFRONTEND_KEYUPLOADWIDGET_H
 
-#include "gpg/GpgContext.h"
+#include "core/GpgContext.h"
 #include "ui/GpgFrontendUI.h"
 
 namespace GpgFrontend::UI {
diff --git a/src/ui/key_generate/KeygenDialog.cpp b/src/ui/key_generate/KeygenDialog.cpp
index cbbe7145..06fa79a5 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 "gpg/function/GpgKeyOpera.h"
+#include "core/function/GpgKeyOpera.h"
 #include "ui/SignalStation.h"
 #include "ui/settings/GlobalSettingStation.h"
 
diff --git a/src/ui/key_generate/KeygenDialog.h b/src/ui/key_generate/KeygenDialog.h
index 8c11916c..751ebdd8 100644
--- a/src/ui/key_generate/KeygenDialog.h
+++ b/src/ui/key_generate/KeygenDialog.h
@@ -27,8 +27,8 @@
 #ifndef __KEYGENDIALOG_H__
 #define __KEYGENDIALOG_H__
 
-#include "gpg/GpgContext.h"
-#include "gpg/GpgGenKeyInfo.h"
+#include "core/GpgContext.h"
+#include "core/GpgGenKeyInfo.h"
 #include "ui/GpgFrontendUI.h"
 
 namespace GpgFrontend::UI {
diff --git a/src/ui/key_generate/SubkeyGenerateDialog.cpp b/src/ui/key_generate/SubkeyGenerateDialog.cpp
index 49fe0f2d..b593b1f9 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 "gpg/function/GpgKeyGetter.h"
-#include "gpg/function/GpgKeyOpera.h"
+#include "core/function/GpgKeyGetter.h"
+#include "core/function/GpgKeyOpera.h"
 #include "ui/SignalStation.h"
 #include "ui/settings/GlobalSettingStation.h"
 
diff --git a/src/ui/key_generate/SubkeyGenerateDialog.h b/src/ui/key_generate/SubkeyGenerateDialog.h
index 0788c9c9..4ab90ad4 100644
--- a/src/ui/key_generate/SubkeyGenerateDialog.h
+++ b/src/ui/key_generate/SubkeyGenerateDialog.h
@@ -27,8 +27,8 @@
 #ifndef GPGFRONTEND_SUBKEYGENERATEDIALOG_H
 #define GPGFRONTEND_SUBKEYGENERATEDIALOG_H
 
-#include "gpg/GpgContext.h"
-#include "gpg/GpgGenKeyInfo.h"
+#include "core/GpgContext.h"
+#include "core/GpgGenKeyInfo.h"
 #include "ui/GpgFrontendUI.h"
 
 namespace GpgFrontend::UI {
diff --git a/src/ui/keypair_details/KeyDetailsDialog.h b/src/ui/keypair_details/KeyDetailsDialog.h
index 1f4dc2a3..e6f4472c 100644
--- a/src/ui/keypair_details/KeyDetailsDialog.h
+++ b/src/ui/keypair_details/KeyDetailsDialog.h
@@ -29,7 +29,7 @@
 #ifndef __KEYDETAILSDIALOG_H__
 #define __KEYDETAILSDIALOG_H__
 
-#include "gpg/GpgContext.h"
+#include "core/GpgContext.h"
 #include "ui/GpgFrontendUI.h"
 
 namespace GpgFrontend::UI {
diff --git a/src/ui/keypair_details/KeyNewUIDDialog.cpp b/src/ui/keypair_details/KeyNewUIDDialog.cpp
index 46a7dc75..78f2badc 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 "gpg/function/GpgKeyGetter.h"
-#include "gpg/function/GpgUIDOperator.h"
+#include "core/function/GpgKeyGetter.h"
+#include "core/function/GpgUIDOperator.h"
 #include "ui/SignalStation.h"
 
 namespace GpgFrontend::UI {
diff --git a/src/ui/keypair_details/KeyNewUIDDialog.h b/src/ui/keypair_details/KeyNewUIDDialog.h
index cbe891c2..24f2c6b1 100644
--- a/src/ui/keypair_details/KeyNewUIDDialog.h
+++ b/src/ui/keypair_details/KeyNewUIDDialog.h
@@ -27,7 +27,7 @@
 #ifndef GPGFRONTEND_KEYNEWUIDDIALOG_H
 #define GPGFRONTEND_KEYNEWUIDDIALOG_H
 
-#include "gpg/GpgContext.h"
+#include "core/GpgContext.h"
 #include "ui/GpgFrontendUI.h"
 
 namespace GpgFrontend::UI {
diff --git a/src/ui/keypair_details/KeyPairDetailTab.cpp b/src/ui/keypair_details/KeyPairDetailTab.cpp
index 8325d794..84de4d92 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 "gpg/function/GpgKeyGetter.h"
-#include "gpg/function/GpgKeyImportExporter.h"
+#include "core/function/GpgKeyGetter.h"
+#include "core/function/GpgKeyImportExporter.h"
 #include "ui/SignalStation.h"
 
 namespace GpgFrontend::UI {
diff --git a/src/ui/keypair_details/KeyPairDetailTab.h b/src/ui/keypair_details/KeyPairDetailTab.h
index de9f512f..9d0d6560 100644
--- a/src/ui/keypair_details/KeyPairDetailTab.h
+++ b/src/ui/keypair_details/KeyPairDetailTab.h
@@ -28,7 +28,7 @@
 #define GPGFRONTEND_KEYPAIRDETAILTAB_H
 
 #include "KeySetExpireDateDialog.h"
-#include "gpg/GpgContext.h"
+#include "core/GpgContext.h"
 #include "import_export/KeyServerImportDialog.h"
 #include "import_export/KeyUploadDialog.h"
 #include "ui/GpgFrontendUI.h"
diff --git a/src/ui/keypair_details/KeyPairOperaTab.cpp b/src/ui/keypair_details/KeyPairOperaTab.cpp
index 50b3272b..6a25cc57 100644
--- a/src/ui/keypair_details/KeyPairOperaTab.cpp
+++ b/src/ui/keypair_details/KeyPairOperaTab.cpp
@@ -26,8 +26,8 @@
 
 #include "KeyPairOperaTab.h"
 
-#include "gpg/function/GpgKeyImportExporter.h"
-#include "gpg/function/GpgKeyOpera.h"
+#include "core/function/GpgKeyImportExporter.h"
+#include "core/function/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 de5c8d36..74bdce0d 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 "gpg/function/GpgKeyGetter.h"
+#include "core/function/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 41838c94..bb41db2b 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 "gpg/function/GpgKeyGetter.h"
+#include "core/function/GpgKeyGetter.h"
 #include "ui/SignalStation.h"
 
 namespace GpgFrontend::UI {
diff --git a/src/ui/keypair_details/KeyPairSubkeyTab.h b/src/ui/keypair_details/KeyPairSubkeyTab.h
index 955c76a0..a64d143c 100644
--- a/src/ui/keypair_details/KeyPairSubkeyTab.h
+++ b/src/ui/keypair_details/KeyPairSubkeyTab.h
@@ -30,7 +30,7 @@
 #define GPGFRONTEND_KEYPAIRSUBKEYTAB_H
 
 #include "KeySetExpireDateDialog.h"
-#include "gpg/GpgContext.h"
+#include "core/GpgContext.h"
 #include "ui/GpgFrontendUI.h"
 #include "ui/key_generate/SubkeyGenerateDialog.h"
 
diff --git a/src/ui/keypair_details/KeyPairUIDTab.cpp b/src/ui/keypair_details/KeyPairUIDTab.cpp
index 2e90d1a3..026ca1bd 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 "gpg/function/GpgKeyGetter.h"
-#include "gpg/function/GpgKeyManager.h"
-#include "gpg/function/GpgUIDOperator.h"
+#include "core/function/GpgKeyGetter.h"
+#include "core/function/GpgKeyManager.h"
+#include "core/function/GpgUIDOperator.h"
 #include "ui/SignalStation.h"
 #include "ui/widgets/TOFUInfoPage.h"
 
diff --git a/src/ui/keypair_details/KeyPairUIDTab.h b/src/ui/keypair_details/KeyPairUIDTab.h
index 9bbde593..fae8f9f2 100644
--- a/src/ui/keypair_details/KeyPairUIDTab.h
+++ b/src/ui/keypair_details/KeyPairUIDTab.h
@@ -31,7 +31,7 @@
 
 #include "KeyNewUIDDialog.h"
 #include "KeyUIDSignDialog.h"
-#include "gpg/GpgContext.h"
+#include "core/GpgContext.h"
 #include "ui/GpgFrontendUI.h"
 
 namespace GpgFrontend::UI {
diff --git a/src/ui/keypair_details/KeySetExpireDateDialog.cpp b/src/ui/keypair_details/KeySetExpireDateDialog.cpp
index 2377ff55..e69c6783 100644
--- a/src/ui/keypair_details/KeySetExpireDateDialog.cpp
+++ b/src/ui/keypair_details/KeySetExpireDateDialog.cpp
@@ -30,8 +30,8 @@
 
 #include <utility>
 
-#include "gpg/function/GpgKeyGetter.h"
-#include "gpg/function/GpgKeyOpera.h"
+#include "core/function/GpgKeyGetter.h"
+#include "core/function/GpgKeyOpera.h"
 #include "ui/SignalStation.h"
 #include "ui/settings/GlobalSettingStation.h"
 #include "ui_ModifiedExpirationDateTime.h"
diff --git a/src/ui/keypair_details/KeySetExpireDateDialog.h b/src/ui/keypair_details/KeySetExpireDateDialog.h
index f8e8f51c..3c0b62f7 100644
--- a/src/ui/keypair_details/KeySetExpireDateDialog.h
+++ b/src/ui/keypair_details/KeySetExpireDateDialog.h
@@ -29,9 +29,9 @@
 #ifndef GPGFRONTEND_KEYSETEXPIREDATEDIALOG_H
 #define GPGFRONTEND_KEYSETEXPIREDATEDIALOG_H
 
-#include "gpg/GpgContext.h"
-#include "gpg/model/GpgKey.h"
-#include "gpg/model/GpgSubKey.h"
+#include "core/GpgContext.h"
+#include "core/model/GpgKey.h"
+#include "core/model/GpgSubKey.h"
 #include "ui/GpgFrontendUI.h"
 
 class Ui_ModifiedExpirationDateTime;
diff --git a/src/ui/keypair_details/KeyUIDSignDialog.cpp b/src/ui/keypair_details/KeyUIDSignDialog.cpp
index f58d99e0..15abba9e 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 "gpg/function/GpgKeyGetter.h"
-#include "gpg/function/GpgKeyManager.h"
+#include "core/function/GpgKeyGetter.h"
+#include "core/function/GpgKeyManager.h"
 #include "ui/SignalStation.h"
 
 namespace GpgFrontend::UI {
diff --git a/src/ui/keypair_details/KeyUIDSignDialog.h b/src/ui/keypair_details/KeyUIDSignDialog.h
index 073aad44..7c1cb58c 100644
--- a/src/ui/keypair_details/KeyUIDSignDialog.h
+++ b/src/ui/keypair_details/KeyUIDSignDialog.h
@@ -27,7 +27,7 @@
 #ifndef GPGFRONTEND_KEYUIDSIGNDIALOG_H
 #define GPGFRONTEND_KEYUIDSIGNDIALOG_H
 
-#include "gpg/GpgContext.h"
+#include "core/GpgContext.h"
 #include "ui/GpgFrontendUI.h"
 #include "ui/widgets/KeyList.h"
 
diff --git a/src/ui/mail/SendMailDialog.cpp b/src/ui/mail/SendMailDialog.cpp
index 739f17e5..215f1629 100644
--- a/src/ui/mail/SendMailDialog.cpp
+++ b/src/ui/mail/SendMailDialog.cpp
@@ -28,7 +28,7 @@
 
 #include "SendMailDialog.h"
 
-#include "gpg/function/GpgKeyGetter.h"
+#include "core/function/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 5d93a710..e8ecfedd 100644
--- a/src/ui/main_window/MainWindow.h
+++ b/src/ui/main_window/MainWindow.h
@@ -29,10 +29,10 @@
 #ifndef __GPGWIN_H__
 #define __GPGWIN_H__
 
-#include "gpg/GpgConstants.h"
-#include "gpg/result_analyse/GpgDecryptResultAnalyse.h"
-#include "gpg/result_analyse/GpgEncryptResultAnalyse.h"
-#include "gpg/result_analyse/GpgSignResultAnalyse.h"
+#include "core/GpgConstants.h"
+#include "core/result_analyse/GpgDecryptResultAnalyse.h"
+#include "core/result_analyse/GpgEncryptResultAnalyse.h"
+#include "core/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 cf01ef3d..5d8db757 100644
--- a/src/ui/main_window/MainWindowFileSlotFunction.cpp
+++ b/src/ui/main_window/MainWindowFileSlotFunction.cpp
@@ -27,8 +27,8 @@
  */
 
 #include "MainWindow.h"
-#include "gpg/function/GpgFileOpera.h"
-#include "gpg/function/GpgKeyGetter.h"
+#include "core/function/GpgFileOpera.h"
+#include "core/function/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 c2ab0df1..0c389901 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 "gpg/function/GpgBasicOperator.h"
-#include "gpg/function/GpgKeyGetter.h"
-#include "gpg/function/GpgKeyImportExporter.h"
+#include "core/function/GpgBasicOperator.h"
+#include "core/function/GpgKeyGetter.h"
+#include "core/function/GpgKeyImportExporter.h"
 #include "ui/UserInterfaceUtils.h"
 #include "ui/help/AboutDialog.h"
 #include "ui/settings/GlobalSettingStation.h"
diff --git a/src/ui/settings/GlobalSettingStation.h b/src/ui/settings/GlobalSettingStation.h
index 537550a4..1189dfe3 100644
--- a/src/ui/settings/GlobalSettingStation.h
+++ b/src/ui/settings/GlobalSettingStation.h
@@ -41,7 +41,7 @@
 namespace vmime::security::cert {
 class defaultCertificateVerifier;
 class X509Certificate;
-}  // namespace vmime::security::cert
+} // namespace vmime::security::cert
 
 namespace GpgFrontend::UI {
 
@@ -51,13 +51,13 @@ namespace GpgFrontend::UI {
  */
 class GlobalSettingStation : public QObject {
   Q_OBJECT
- public:
+public:
   /**
    * @brief Get the Instance object
    *
    * @return GlobalSettingStation&
    */
-  static GlobalSettingStation& GetInstance();
+  static GlobalSettingStation &GetInstance();
 
   /**
    * @brief Construct a new Global Setting Station object
@@ -76,7 +76,7 @@ class GlobalSettingStation : public QObject {
    *
    * @return libconfig::Setting&
    */
-  libconfig::Setting& GetUISettings() noexcept { return ui_cfg_.getRoot(); }
+  libconfig::Setting &GetUISettings() noexcept { return ui_cfg_.getRoot(); }
 
   /**
    * @brief Get the App Dir object
@@ -158,14 +158,14 @@ class GlobalSettingStation : public QObject {
    *
    * @param path
    */
-  void AddRootCert(const boost::filesystem::path& path);
+  void AddRootCert(const boost::filesystem::path &path);
 
   /**
    * @brief Get the Root Certs object
    *
    * @return const std::vector<std::shared_ptr<X509>>&
    */
-  const std::vector<std::shared_ptr<X509>>& GetRootCerts();
+  const std::vector<std::shared_ptr<X509>> &GetRootCerts();
 
   /**
    * @brief
@@ -187,7 +187,7 @@ class GlobalSettingStation : public QObject {
    * @return std::string
    */
 
-  std::string SaveDataObj(const std::string& _key, const nlohmann::json& value);
+  std::string SaveDataObj(const std::string &_key, const nlohmann::json &value);
 
   /**
    * @brief Get the Data Object object
@@ -195,7 +195,7 @@ class GlobalSettingStation : public QObject {
    * @param _key
    * @return std::optional<nlohmann::json>
    */
-  std::optional<nlohmann::json> GetDataObject(const std::string& _key);
+  std::optional<nlohmann::json> GetDataObject(const std::string &_key);
 
   /**
    * @brief Get the Data Object By Ref object
@@ -203,57 +203,56 @@ class GlobalSettingStation : public QObject {
    * @param _ref
    * @return std::optional<nlohmann::json>
    */
-  std::optional<nlohmann::json> GetDataObjectByRef(const std::string& _ref);
+  std::optional<nlohmann::json> GetDataObjectByRef(const std::string &_ref);
 
- private:
+private:
   boost::filesystem::path app_path_ =
-      qApp->applicationDirPath().toStdString();  ///< Program Location
+      qApp->applicationDirPath().toStdString(); ///< Program Location
   boost::filesystem::path app_data_path_ =
       QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation)
-          .toStdString();  ///< Program Data Location
+          .toStdString(); ///< Program Data Location
   boost::filesystem::path app_log_path_ =
-      app_data_path_ / "logs";  ///< Program Data Location
+      app_data_path_ / "logs"; ///< Program Data Location
   boost::filesystem::path app_data_objs_path_ =
-      app_data_path_ / "objs";  ///< Object storage path
+      app_data_path_ / "objs"; ///< Object storage path
 
 #ifdef LINUX_INSTALL_BUILD
   boost::filesystem::path app_resource_path_ =
       boost::filesystem::path(APP_LOCALSTATE_PATH) /
-      "gpgfrontend";  ///< Program Data Location
+      "gpgfrontend"; ///< Program Data Location
 #else
   boost::filesystem::path app_resource_path_ =
-      RESOURCE_DIR_BOOST_PATH(app_path_);  ///< Program Data Location
+      RESOURCE_DIR_BOOST_PATH(app_path_); ///< Program Data Location
 #endif
 
 #ifdef LINUX_INSTALL_BUILD
   boost::filesystem::path app_locale_path_ =
-      std::string(APP_LOCALE_PATH);  ///< Program Data Location
+      std::string(APP_LOCALE_PATH); ///< Program Data Location
 #else
   boost::filesystem::path app_locale_path_ =
-      app_resource_path_ / "locales";  ///< Program Data Location
+      app_resource_path_ / "locales"; ///< Program Data Location
 #endif
 
   boost::filesystem::path app_configure_path_ =
       QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation)
-          .toStdString();  ///< Program Configure Location
+          .toStdString(); ///< Program Configure Location
   boost::filesystem::path app_secure_path_ =
-      app_configure_path_ /
-      "secure";  ///< Where sensitive information is stored
+      app_configure_path_ / "secure"; ///< Where sensitive information is stored
   boost::filesystem::path app_secure_key_path_ =
-      app_secure_path_ / "app.key";  ///<
+      app_secure_path_ / "app.key"; ///<
   boost::filesystem::path ui_config_dir_path_ =
       app_configure_path_ /
-      "UserInterface";  ///< Configure File Directory Location
+      "UserInterface"; ///< Configure File Directory Location
   boost::filesystem::path ui_config_path_ =
-      ui_config_dir_path_ / "ui.cfg";  ///< UI Configure File Location
+      ui_config_dir_path_ / "ui.cfg"; ///< UI Configure File Location
 
-  libconfig::Config ui_cfg_;                       ///<
-  std::vector<std::shared_ptr<X509>> root_certs_;  ///<
-  std::random_device rd_;                          ///<
-  std::mt19937 mt_;                                ///<
-  QByteArray hash_key_;                            ///<
+  libconfig::Config ui_cfg_;                      ///<
+  std::vector<std::shared_ptr<X509>> root_certs_; ///<
+  std::random_device rd_;                         ///<
+  std::mt19937 mt_;                               ///<
+  QByteArray hash_key_;                           ///<
 
-  static std::unique_ptr<GlobalSettingStation> instance_;  ///<
+  static std::unique_ptr<GlobalSettingStation> instance_; ///<
 
   /**
    * @brief
@@ -269,6 +268,6 @@ class GlobalSettingStation : public QObject {
    */
   std::string generate_passphrase(int len);
 };
-}  // namespace GpgFrontend::UI
+} // namespace GpgFrontend::UI
 
-#endif  // GPGFRONTEND_GLOBALSETTINGSTATION_H
+#endif // GPGFRONTEND_GLOBALSETTINGSTATION_H
diff --git a/src/ui/thread/CtxCheckThread.cpp b/src/ui/thread/CtxCheckThread.cpp
index 7808968d..bc180ae8 100644
--- a/src/ui/thread/CtxCheckThread.cpp
+++ b/src/ui/thread/CtxCheckThread.cpp
@@ -26,9 +26,9 @@
 
 #include "CtxCheckThread.h"
 
-#include "gpg/GpgContext.h"
-#include "gpg/GpgCoreInit.h"
-#include "gpg/function/GpgKeyGetter.h"
+#include "core/GpgContext.h"
+#include "core/GpgCoreInit.h"
+#include "core/function/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 5364f634..8ae31bb8 100644
--- a/src/ui/thread/SMTPSendMailThread.cpp
+++ b/src/ui/thread/SMTPSendMailThread.cpp
@@ -28,9 +28,9 @@
 
 #include <boost/format.hpp>
 
-#include "gpg/function/GpgBasicOperator.h"
-#include "gpg/function/GpgKeyGetter.h"
-#include "gpg/function/GpgKeyImportExporter.h"
+#include "core/function/GpgBasicOperator.h"
+#include "core/function/GpgKeyGetter.h"
+#include "core/function/GpgKeyImportExporter.h"
 
 namespace GpgFrontend::UI {
 
diff --git a/src/ui/widgets/InfoBoardWidget.h b/src/ui/widgets/InfoBoardWidget.h
index c92d5981..51ef1cf5 100644
--- a/src/ui/widgets/InfoBoardWidget.h
+++ b/src/ui/widgets/InfoBoardWidget.h
@@ -30,7 +30,7 @@
 #define __VERIFYNOTIFICATION_H__
 
 #include "PlainTextEditorPage.h"
-#include "gpg/result_analyse/GpgVerifyResultAnalyse.h"
+#include "core/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 b9cc30d4..b8894e03 100644
--- a/src/ui/widgets/KeyList.cpp
+++ b/src/ui/widgets/KeyList.cpp
@@ -31,8 +31,8 @@
 #include <boost/format.hpp>
 #include <utility>
 
-#include "gpg/GpgCoreInit.h"
-#include "gpg/function/GpgKeyGetter.h"
+#include "core/GpgCoreInit.h"
+#include "core/function/GpgKeyGetter.h"
 #include "ui/SignalStation.h"
 #include "ui/UserInterfaceUtils.h"
 #include "ui/settings/GlobalSettingStation.h"
diff --git a/src/ui/widgets/KeyList.h b/src/ui/widgets/KeyList.h
index 26cd8b9c..d79f9331 100644
--- a/src/ui/widgets/KeyList.h
+++ b/src/ui/widgets/KeyList.h
@@ -31,7 +31,7 @@
 
 #include <utility>
 
-#include "gpg/GpgContext.h"
+#include "core/GpgContext.h"
 #include "ui/import_export/KeyImportDetailDialog.h"
 
 class Ui_KeyList;
diff --git a/src/ui/widgets/PlainTextEditorPage.h b/src/ui/widgets/PlainTextEditorPage.h
index 64ad73ee..f73e2282 100644
--- a/src/ui/widgets/PlainTextEditorPage.h
+++ b/src/ui/widgets/PlainTextEditorPage.h
@@ -29,7 +29,7 @@
 #ifndef __EDITORPAGE_H__
 #define __EDITORPAGE_H__
 
-#include "gpg/GpgConstants.h"
+#include "core/GpgConstants.h"
 #include "ui/GpgFrontendUI.h"
 
 class Ui_PlainTextEditor;
diff --git a/src/ui/widgets/TOFUInfoPage.h b/src/ui/widgets/TOFUInfoPage.h
index 761aa284..445b1567 100644
--- a/src/ui/widgets/TOFUInfoPage.h
+++ b/src/ui/widgets/TOFUInfoPage.h
@@ -27,7 +27,7 @@
 #ifndef GPGFRONTEND_TOFUINFOPAGE_H
 #define GPGFRONTEND_TOFUINFOPAGE_H
 
-#include "gpg/GpgModel.h"
+#include "core/GpgModel.h"
 #include "ui/GpgFrontendUI.h"
 
 namespace GpgFrontend::UI {
diff --git a/src/ui/widgets/VerifyKeyDetailBox.cpp b/src/ui/widgets/VerifyKeyDetailBox.cpp
index bbde591d..1bb827d1 100644
--- a/src/ui/widgets/VerifyKeyDetailBox.cpp
+++ b/src/ui/widgets/VerifyKeyDetailBox.cpp
@@ -28,7 +28,7 @@
 
 #include "ui/widgets/VerifyKeyDetailBox.h"
 
-#include "gpg/function/GpgKeyGetter.h"
+#include "core/function/GpgKeyGetter.h"
 
 namespace GpgFrontend::UI {