diff --git a/.gitmodules b/.gitmodules
index 9a0c98c..45a9506 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "singleapplication"]
-	path = SingleApplication
+	path = 3rdparty/SingleApplication
 	url = https://github.com/itay-grudev/SingleApplication.git
 
 [submodule "plog"]
-	path = plog
+	path = 3rdparty/plog
 	url = https://github.com/SergiusTheBest/plog.git
diff --git a/SingleApplication b/3rdparty/SingleApplication
similarity index 100%
rename from SingleApplication
rename to 3rdparty/SingleApplication
diff --git a/plog b/3rdparty/plog
similarity index 100%
rename from plog
rename to 3rdparty/plog
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d5f3cbd..512c3dd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,6 +9,8 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty")
+
 set(QAPPLICATION_CLASS QApplication CACHE STRING "Inheritance class for SingleApplication")
 
 include(cmake/CPM.cmake)
@@ -22,8 +24,19 @@ find_package(Qt5 REQUIRED COMPONENTS
     DBus
 )
 
-CPMAddPackage("gh:itay-grudev/SingleApplication@3.3.0")
-CPMAddPackage("gh:SergiusTheBest/plog#1.1.5")
+CPMAddPackage(
+    NAME SingleApplication
+    GITHUB_REPOSITORY itay-grudev/SingleApplication
+    VERSION 3.3.0
+    CPM_LOCAL_PACKAGES_ONLY YES
+)
+CPMAddPackage(
+    NAME plog
+    GITHUB_REPOSITORY SergiusTheBest/plog
+    GIT_TAG 1.1.5
+    CPM_LOCAL_PACKAGES_ONLY YES
+    # CPM_USE_LOCAL_PACKAGES YES
+)
 
 add_subdirectory(GPService)
 add_subdirectory(GPClient)
\ No newline at end of file