17 files changed, 26 insertions, 28 deletions
diff --git a/src/module/CMakeLists.txt b/src/module/CMakeLists.txt
index d298dbb6..8d894b00 100644
--- a/src/module/CMakeLists.txt
+++ b/src/module/CMakeLists.txt
@@ -51,16 +51,14 @@ if (XCODE_BUILD)
     XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "${GPGFRONTEND_XOCDE_CODE_SIGN_IDENTITY}")
 endif ()
 
-# tracking integrated modules
+# tracking modules
 set(all_integrated_module_libraries "")
-file(GLOB children LIST_DIRECTORIES true "integrated/*")
+file(GLOB children LIST_DIRECTORIES true "mods/*")
 foreach(child ${children})
     if(IS_DIRECTORY ${child})
         get_filename_component(dirName ${child} NAME)
-        add_subdirectory("integrated/${dirName}")
-
-        string(REPLACE "_module" "" stripped_module ${dirName})
-        set(integrated_lib_name "gpgfrontend_integrated_module_${stripped_module}")
-        list(APPEND all_integrated_module_libraries ${integrated_lib_name})
+        add_subdirectory("mods/${dirName}")
+        
+        list(APPEND all_integrated_module_libraries ${dirName})
     endif()
 endforeach()
 \ No newline at end of file
diff --git a/src/module/integrated/gnupg_info_gathering_module/CMakeLists.txt b/src/module/mods/gpg_info/CMakeLists.txt
index 3f1645eb..6759456c 100644
--- a/src/module/integrated/gnupg_info_gathering_module/CMakeLists.txt
+++ b/src/module/mods/gpg_info/CMakeLists.txt
@@ -28,21 +28,21 @@
 aux_source_directory(. INTEGRATED_MODULE_SOURCE)
 
 # define libgpgfrontend_module
-add_library(gpgfrontend_gnupg_info_gathering SHARED ${INTEGRATED_MODULE_SOURCE})
+add_library(mod_gpg_info SHARED ${INTEGRATED_MODULE_SOURCE})
 set(_export_file "${CMAKE_CURRENT_SOURCE_DIR}/GFModuleExport.h")
-generate_export_header(gpgfrontend_gnupg_info_gathering
+generate_export_header(mod_gpg_info
   BASE_NAME "GF_MODULE"
   EXPORT_FILE_NAME "${_export_file}")
 
-target_include_directories(gpgfrontend_gnupg_info_gathering PRIVATE 
+target_include_directories(mod_gpg_info PRIVATE 
   ${CMAKE_SOURCE_DIR}/third_party/spdlog/include)
 
 # set output directory
-set_target_properties(gpgfrontend_gnupg_info_gathering PROPERTIES
+set_target_properties(mod_gpg_info PROPERTIES
   LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mods)
 
 if (XCODE_BUILD)
-  set_target_properties(gpgfrontend_gnupg_info_gathering
+  set_target_properties(mod_gpg_info
     PROPERTIES
     ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}
     LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}
@@ -52,16 +52,16 @@ if (XCODE_BUILD)
 endif ()
 
 # link sdk
-target_link_libraries(gpgfrontend_gnupg_info_gathering PRIVATE
+target_link_libraries(mod_gpg_info PRIVATE
   gpgfrontend_module_sdk)
 
 # link qt
-target_link_libraries(gpgfrontend_gnupg_info_gathering PRIVATE
+target_link_libraries(mod_gpg_info PRIVATE
   Qt6::Core)
        
 
 # property
-set_property(TARGET gpgfrontend_gnupg_info_gathering PROPERTY AUTOMOC ON)
+set_property(TARGET mod_gpg_info PROPERTY AUTOMOC ON)
 
 # using std c++ 17
-target_compile_features(gpgfrontend_gnupg_info_gathering PRIVATE cxx_std_17)
-\ No newline at end of file
+target_compile_features(mod_gpg_info PRIVATE cxx_std_17)
+\ No newline at end of file
diff --git a/src/module/integrated/version_checking_module/GFModuleExport.h b/src/module/mods/gpg_info/GFModuleExport.h
index 6e02c878..a1fc1053 100644
--- a/src/module/integrated/version_checking_module/GFModuleExport.h
+++ b/src/module/mods/gpg_info/GFModuleExport.h
@@ -7,7 +7,7 @@
 #  define GF_MODULE_NO_EXPORT
 #else
 #  ifndef GF_MODULE_EXPORT
-#    ifdef gpgfrontend_version_checking_EXPORTS
+#    ifdef mod_gpg_info_EXPORTS
         /* We are building this library */
 #      define GF_MODULE_EXPORT __attribute__((visibility("default")))
 #    else
diff --git a/src/module/integrated/gnupg_info_gathering_module/GnuPGInfoGatheringModule.cpp b/src/module/mods/gpg_info/GnuPGInfoGatheringModule.cpp
index 3965c661..3965c661 100644
--- a/src/module/integrated/gnupg_info_gathering_module/GnuPGInfoGatheringModule.cpp
+++ b/src/module/mods/gpg_info/GnuPGInfoGatheringModule.cpp
diff --git a/src/module/integrated/gnupg_info_gathering_module/GnuPGInfoGatheringModule.h b/src/module/mods/gpg_info/GnuPGInfoGatheringModule.h
index 35ee4ac3..35ee4ac3 100644
--- a/src/module/integrated/gnupg_info_gathering_module/GnuPGInfoGatheringModule.h
+++ b/src/module/mods/gpg_info/GnuPGInfoGatheringModule.h
diff --git a/src/module/integrated/gnupg_info_gathering_module/GpgInfo.cpp b/src/module/mods/gpg_info/GpgInfo.cpp
index 680f4a8a..680f4a8a 100644
--- a/src/module/integrated/gnupg_info_gathering_module/GpgInfo.cpp
+++ b/src/module/mods/gpg_info/GpgInfo.cpp
diff --git a/src/module/integrated/gnupg_info_gathering_module/GpgInfo.h b/src/module/mods/gpg_info/GpgInfo.h
index 1aacc207..1aacc207 100644
--- a/src/module/integrated/gnupg_info_gathering_module/GpgInfo.h
+++ b/src/module/mods/gpg_info/GpgInfo.h
diff --git a/src/module/integrated/gnupg_info_gathering_module/QtLoggerFmt.h b/src/module/mods/gpg_info/QtLoggerFmt.h
index 23997465..23997465 100644
--- a/src/module/integrated/gnupg_info_gathering_module/QtLoggerFmt.h
+++ b/src/module/mods/gpg_info/QtLoggerFmt.h
diff --git a/src/module/integrated/version_checking_module/CMakeLists.txt b/src/module/mods/ver_check/CMakeLists.txt
index 19706e87..b011410f 100644
--- a/src/module/integrated/version_checking_module/CMakeLists.txt
+++ b/src/module/mods/ver_check/CMakeLists.txt
@@ -28,21 +28,21 @@
 aux_source_directory(. INTEGRATED_MODULE_SOURCE)
 
 # define libgpgfrontend_module
-add_library(gpgfrontend_version_checking SHARED ${INTEGRATED_MODULE_SOURCE})
+add_library(mod_ver_check SHARED ${INTEGRATED_MODULE_SOURCE})
 set(_export_file "${CMAKE_CURRENT_SOURCE_DIR}/GFModuleExport.h")
-generate_export_header(gpgfrontend_version_checking 
+generate_export_header(mod_ver_check 
   BASE_NAME "GF_MODULE"
   EXPORT_FILE_NAME "${_export_file}")
 
-target_include_directories(gpgfrontend_version_checking PRIVATE 
+target_include_directories(mod_ver_check PRIVATE 
   ${CMAKE_SOURCE_DIR}/third_party/spdlog/include)
 
 # set output directory
-set_target_properties(gpgfrontend_version_checking PROPERTIES
+set_target_properties(mod_ver_check PROPERTIES
   LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mods)
 
 if (XCODE_BUILD)
-  set_target_properties(gpgfrontend_version_checking
+  set_target_properties(mod_ver_check
     PROPERTIES
     ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}
     LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}
@@ -52,19 +52,19 @@ if (XCODE_BUILD)
 endif ()
 
 # link sdk
-target_link_libraries(gpgfrontend_version_checking PRIVATE
+target_link_libraries(mod_ver_check PRIVATE
   gpgfrontend_module_sdk)
 
 if(GPGFRONTEND_QT5_BUILD)
   # link Qt
-  target_link_libraries(gpgfrontend_version_checking PUBLIC Qt5::Core Qt5::Network)
+  target_link_libraries(mod_ver_check PUBLIC Qt5::Core Qt5::Network)
 else()
   # link Qt
-  target_link_libraries(gpgfrontend_version_checking PUBLIC Qt6::Core Qt6::Network)
+  target_link_libraries(mod_ver_check PUBLIC Qt6::Core Qt6::Network)
 endif()
 
 # property
-set_property(TARGET gpgfrontend_version_checking PROPERTY AUTOMOC ON)
+set_property(TARGET mod_ver_check PROPERTY AUTOMOC ON)
 
 # using std c++ 17
-target_compile_features(gpgfrontend_version_checking PRIVATE cxx_std_17)
-\ No newline at end of file
+target_compile_features(mod_ver_check PRIVATE cxx_std_17)
+\ No newline at end of file
diff --git a/src/module/integrated/gnupg_info_gathering_module/GFModuleExport.h b/src/module/mods/ver_check/GFModuleExport.h
index fd18dfb1..ce663b5f 100644
--- a/src/module/integrated/gnupg_info_gathering_module/GFModuleExport.h
+++ b/src/module/mods/ver_check/GFModuleExport.h
@@ -7,7 +7,7 @@
 #  define GF_MODULE_NO_EXPORT
 #else
 #  ifndef GF_MODULE_EXPORT
-#    ifdef gpgfrontend_gnupg_info_gathering_EXPORTS
+#    ifdef mod_ver_check_EXPORTS
         /* We are building this library */
 #      define GF_MODULE_EXPORT __attribute__((visibility("default")))
 #    else
diff --git a/src/module/integrated/version_checking_module/QtLoggerFmt.h b/src/module/mods/ver_check/QtLoggerFmt.h
index 23997465..23997465 100644
--- a/src/module/integrated/version_checking_module/QtLoggerFmt.h
+++ b/src/module/mods/ver_check/QtLoggerFmt.h
diff --git a/src/module/integrated/version_checking_module/SoftwareVersion.cpp b/src/module/mods/ver_check/SoftwareVersion.cpp
index cd864195..cd864195 100644
--- a/src/module/integrated/version_checking_module/SoftwareVersion.cpp
+++ b/src/module/mods/ver_check/SoftwareVersion.cpp
diff --git a/src/module/integrated/version_checking_module/SoftwareVersion.h b/src/module/mods/ver_check/SoftwareVersion.h
index 6b05d413..6b05d413 100644
--- a/src/module/integrated/version_checking_module/SoftwareVersion.h
+++ b/src/module/mods/ver_check/SoftwareVersion.h
diff --git a/src/module/integrated/version_checking_module/VersionCheckTask.cpp b/src/module/mods/ver_check/VersionCheckTask.cpp
index 5ea9c48e..5ea9c48e 100644
--- a/src/module/integrated/version_checking_module/VersionCheckTask.cpp
+++ b/src/module/mods/ver_check/VersionCheckTask.cpp
diff --git a/src/module/integrated/version_checking_module/VersionCheckTask.h b/src/module/mods/ver_check/VersionCheckTask.h
index df801570..df801570 100644
--- a/src/module/integrated/version_checking_module/VersionCheckTask.h
+++ b/src/module/mods/ver_check/VersionCheckTask.h
diff --git a/src/module/integrated/version_checking_module/VersionCheckingModule.cpp b/src/module/mods/ver_check/VersionCheckingModule.cpp
index 35d3b82e..35d3b82e 100644
--- a/src/module/integrated/version_checking_module/VersionCheckingModule.cpp
+++ b/src/module/mods/ver_check/VersionCheckingModule.cpp
diff --git a/src/module/integrated/version_checking_module/VersionCheckingModule.h b/src/module/mods/ver_check/VersionCheckingModule.h
index 35ee4ac3..35ee4ac3 100644
--- a/src/module/integrated/version_checking_module/VersionCheckingModule.h
+++ b/src/module/mods/ver_check/VersionCheckingModule.h