diff --git a/thirdparty/qtkeychain/CMakeLists.txt b/thirdparty/qtkeychain/qtkeychain/CMakeLists.txt
similarity index 77%
rename from thirdparty/qtkeychain/CMakeLists.txt
rename to thirdparty/qtkeychain/qtkeychain/CMakeLists.txt
index 46a848a8c..d1bb39306 100644
--- a/thirdparty/qtkeychain/CMakeLists.txt
+++ b/thirdparty/qtkeychain/qtkeychain/CMakeLists.txt
@@ -66,19 +66,19 @@ set_target_properties(qtkeychain PROPERTIES
     SOVERSION ${QTKEYCHAIN_SOVERSION}
 )
 
-install(FILES keychain.h qkeychain_export.h
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/qtkeychain/
-)
+#install(FILES keychain.h qkeychain_export.h
+#        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/qtkeychain/
+#)
 
-install(TARGETS qtkeychain
-  EXPORT QtKeychainLibraryDepends
-  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-)
+#install(TARGETS qtkeychain
+#  EXPORT QtKeychainLibraryDepends
+#  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+#  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+#  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+#)
 
-add_executable( testclient testclient.cpp )
-target_link_libraries( testclient qtkeychain)
+#add_executable( testclient testclient.cpp )
+#target_link_libraries( testclient qtkeychain)
 
 
 ###
@@ -95,11 +95,11 @@ configure_file(QtKeychainConfig.cmake.in
 configure_file(QtKeychainConfigVersion.cmake.in
   "${PROJECT_BINARY_DIR}/QtKeychainConfigVersion.cmake" @ONLY)
 
-install(EXPORT QtKeychainLibraryDepends
-    DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/QtKeychain"
-)
+#install(EXPORT QtKeychainLibraryDepends
+#    DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/QtKeychain"
+#)
 
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtKeychainConfig.cmake
-              ${CMAKE_CURRENT_BINARY_DIR}/QtKeychainConfigVersion.cmake
-        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/QtKeychain
-)
+#install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtKeychainConfig.cmake
+#              ${CMAKE_CURRENT_BINARY_DIR}/QtKeychainConfigVersion.cmake
+#        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/QtKeychain
+#)
diff --git a/thirdparty/qtkeychain/COPYING b/thirdparty/qtkeychain/qtkeychain/COPYING
similarity index 100%
rename from thirdparty/qtkeychain/COPYING
rename to thirdparty/qtkeychain/qtkeychain/COPYING
diff --git a/thirdparty/qtkeychain/QtKeychainBuildTreeSettings.cmake.in b/thirdparty/qtkeychain/qtkeychain/QtKeychainBuildTreeSettings.cmake.in
similarity index 100%
rename from thirdparty/qtkeychain/QtKeychainBuildTreeSettings.cmake.in
rename to thirdparty/qtkeychain/qtkeychain/QtKeychainBuildTreeSettings.cmake.in
diff --git a/thirdparty/qtkeychain/QtKeychainConfig.cmake.in b/thirdparty/qtkeychain/qtkeychain/QtKeychainConfig.cmake.in
similarity index 100%
rename from thirdparty/qtkeychain/QtKeychainConfig.cmake.in
rename to thirdparty/qtkeychain/qtkeychain/QtKeychainConfig.cmake.in
diff --git a/thirdparty/qtkeychain/QtKeychainConfigVersion.cmake.in b/thirdparty/qtkeychain/qtkeychain/QtKeychainConfigVersion.cmake.in
similarity index 100%
rename from thirdparty/qtkeychain/QtKeychainConfigVersion.cmake.in
rename to thirdparty/qtkeychain/qtkeychain/QtKeychainConfigVersion.cmake.in
diff --git a/thirdparty/qtkeychain/ReadMe.markdown b/thirdparty/qtkeychain/qtkeychain/ReadMe.markdown
similarity index 100%
rename from thirdparty/qtkeychain/ReadMe.markdown
rename to thirdparty/qtkeychain/qtkeychain/ReadMe.markdown
diff --git a/thirdparty/qtkeychain/ReadMe.txt b/thirdparty/qtkeychain/qtkeychain/ReadMe.txt
similarity index 100%
rename from thirdparty/qtkeychain/ReadMe.txt
rename to thirdparty/qtkeychain/qtkeychain/ReadMe.txt
diff --git a/thirdparty/qtkeychain/cmake/Modules/GNUInstallDirs.cmake b/thirdparty/qtkeychain/qtkeychain/cmake/Modules/GNUInstallDirs.cmake
similarity index 100%
rename from thirdparty/qtkeychain/cmake/Modules/GNUInstallDirs.cmake
rename to thirdparty/qtkeychain/qtkeychain/cmake/Modules/GNUInstallDirs.cmake
diff --git a/thirdparty/qtkeychain/keychain.cpp b/thirdparty/qtkeychain/qtkeychain/keychain.cpp
similarity index 100%
rename from thirdparty/qtkeychain/keychain.cpp
rename to thirdparty/qtkeychain/qtkeychain/keychain.cpp
diff --git a/thirdparty/qtkeychain/keychain.h b/thirdparty/qtkeychain/qtkeychain/keychain.h
similarity index 100%
rename from thirdparty/qtkeychain/keychain.h
rename to thirdparty/qtkeychain/qtkeychain/keychain.h
diff --git a/thirdparty/qtkeychain/keychain_dbus.cpp b/thirdparty/qtkeychain/qtkeychain/keychain_dbus.cpp
similarity index 100%
rename from thirdparty/qtkeychain/keychain_dbus.cpp
rename to thirdparty/qtkeychain/qtkeychain/keychain_dbus.cpp
diff --git a/thirdparty/qtkeychain/keychain_mac.cpp b/thirdparty/qtkeychain/qtkeychain/keychain_mac.cpp
similarity index 100%
rename from thirdparty/qtkeychain/keychain_mac.cpp
rename to thirdparty/qtkeychain/qtkeychain/keychain_mac.cpp
diff --git a/thirdparty/qtkeychain/keychain_p.h b/thirdparty/qtkeychain/qtkeychain/keychain_p.h
similarity index 100%
rename from thirdparty/qtkeychain/keychain_p.h
rename to thirdparty/qtkeychain/qtkeychain/keychain_p.h
diff --git a/thirdparty/qtkeychain/keychain_win.cpp b/thirdparty/qtkeychain/qtkeychain/keychain_win.cpp
similarity index 100%
rename from thirdparty/qtkeychain/keychain_win.cpp
rename to thirdparty/qtkeychain/qtkeychain/keychain_win.cpp
diff --git a/thirdparty/qtkeychain/org.kde.KWallet.xml b/thirdparty/qtkeychain/qtkeychain/org.kde.KWallet.xml
similarity index 100%
rename from thirdparty/qtkeychain/org.kde.KWallet.xml
rename to thirdparty/qtkeychain/qtkeychain/org.kde.KWallet.xml
diff --git a/thirdparty/qtkeychain/qkeychain_export.h b/thirdparty/qtkeychain/qtkeychain/qkeychain_export.h
similarity index 100%
rename from thirdparty/qtkeychain/qkeychain_export.h
rename to thirdparty/qtkeychain/qtkeychain/qkeychain_export.h
diff --git a/thirdparty/qtkeychain/testclient.cpp b/thirdparty/qtkeychain/qtkeychain/testclient.cpp
similarity index 100%
rename from thirdparty/qtkeychain/testclient.cpp
rename to thirdparty/qtkeychain/qtkeychain/testclient.cpp