46 files changed, 5 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 36ffbfb7..420c9067 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -575,7 +575,7 @@ install(DIRECTORY ${CMAKE_SOURCE_DIR}/3rdparty-notices DESTINATION .)
 install(FILES "${CMAKE_SOURCE_DIR}/bin/freetrackclient.dll" DESTINATION . ${opentrack-perms})
 install(FILES "${CMAKE_SOURCE_DIR}/bin/NPClient.dll" "${CMAKE_SOURCE_DIR}/bin/NPClient64.dll" "${CMAKE_SOURCE_DIR}/bin/TrackIR.exe" DESTINATION .
     ${opentrack-perms})
-install(DIRECTORY "${CMAKE_SOURCE_DIR}/bin/settings" "${CMAKE_SOURCE_DIR}/clientfiles" DESTINATION .)
+install(DIRECTORY "${CMAKE_SOURCE_DIR}/bin/settings" "${CMAKE_SOURCE_DIR}/contrib" DESTINATION .)
 
 if(NOT WIN32 AND SDK_WINE_PREFIX AND NOT SDK_WINE_NO_WRAPPER)
     install(FILES "${CMAKE_BINARY_DIR}/opentrack-wrapper-wine.exe.so"
@@ -594,7 +594,8 @@ endif()
 
 if(WIN32)
     install(FILES "${CMAKE_SOURCE_DIR}/ftnoir_tracker_rs/rs_impl/bin/opentrack-tracker-rs-impl.exe" DESTINATION . ${opentrack-perms})
-    install(FILES "${CMAKE_SOURCE_DIR}/ftnoir_tracker_rs/redist/intel_rs_sdk_runtime_websetup_6.0.21.6598.exe" DESTINATION ./clientfiles/ ${opentrack-perms})
+    install(FILES
+        "${CMAKE_SOURCE_DIR}/ftnoir_tracker_rs/redist/intel_rs_sdk_runtime_websetup_6.0.21.6598.exe" DESTINATION ./contrib/ ${opentrack-perms})
 endif()
 
 if(APPLE)
diff --git a/clientfiles/FlightGear/Protocol/headtracker.xml b/contrib/FlightGear/Protocol/headtracker.xml
index 8c14119a..8c14119a 100644
--- a/clientfiles/FlightGear/Protocol/headtracker.xml
+++ b/contrib/FlightGear/Protocol/headtracker.xml
diff --git a/clientfiles/FlightGear/readme.txt b/contrib/FlightGear/readme.txt
index 48cee837..48cee837 100644
--- a/clientfiles/FlightGear/readme.txt
+++ b/contrib/FlightGear/readme.txt
diff --git a/clientfiles/Tir4Fun/npclient.dll b/contrib/Tir4Fun/npclient.dll
index e392442e..e392442e 100644
--- a/clientfiles/Tir4Fun/npclient.dll
+++ b/contrib/Tir4Fun/npclient.dll
diff --git a/clientfiles/Tir4Fun/readme.txt b/contrib/Tir4Fun/readme.txt
index d64af301..d64af301 100644
--- a/clientfiles/Tir4Fun/readme.txt
+++ b/contrib/Tir4Fun/readme.txt
diff --git a/clientfiles/Tir4Fun/tir4fun.exe b/contrib/Tir4Fun/tir4fun.exe
index a51eced0..a51eced0 100644
--- a/clientfiles/Tir4Fun/tir4fun.exe
+++ b/contrib/Tir4Fun/tir4fun.exe
diff --git a/clientfiles/aruco/aruco_create_marker.exe b/contrib/aruco/aruco_create_marker.exe
index 4400e80e..4400e80e 100644
--- a/clientfiles/aruco/aruco_create_marker.exe
+++ b/contrib/aruco/aruco_create_marker.exe
diff --git a/clientfiles/aruco/test3.jpg b/contrib/aruco/test3.jpg
index 2ff6dbd0..2ff6dbd0 100644
--- a/clientfiles/aruco/test3.jpg
+++ b/contrib/aruco/test3.jpg
diff --git a/clientfiles/cfs3/readme.txt b/contrib/cfs3/readme.txt
index e51cebfa..e51cebfa 100644
--- a/clientfiles/cfs3/readme.txt
+++ b/contrib/cfs3/readme.txt
diff --git a/clientfiles/cfs3/tirviews.dll b/contrib/cfs3/tirviews.dll
index a1fb306f..a1fb306f 100644
--- a/clientfiles/cfs3/tirviews.dll
+++ b/contrib/cfs3/tirviews.dll
diff --git a/clientfiles/cute-octopus-vector-material_15-1831.jpg b/contrib/cute-octopus-vector-material_15-1831.jpg
index c4e5318f..c4e5318f 100644
--- a/clientfiles/cute-octopus-vector-material_15-1831.jpg
+++ b/contrib/cute-octopus-vector-material_15-1831.jpg
diff --git a/clientfiles/dropbox-uploader/README b/contrib/dropbox-uploader/README
index 49189e17..49189e17 100644
--- a/clientfiles/dropbox-uploader/README
+++ b/contrib/dropbox-uploader/README
diff --git a/clientfiles/dropbox-uploader/dropbox_uploader.sh b/contrib/dropbox-uploader/dropbox_uploader.sh
index 1e7b830e..1e7b830e 100644
--- a/clientfiles/dropbox-uploader/dropbox_uploader.sh
+++ b/contrib/dropbox-uploader/dropbox_uploader.sh
diff --git a/clientfiles/freepie-udp/com.freepie.android.imu.apk b/contrib/freepie-udp/com.freepie.android.imu.apk
index b1f052aa..b1f052aa 100644
--- a/clientfiles/freepie-udp/com.freepie.android.imu.apk
+++ b/contrib/freepie-udp/com.freepie.android.imu.apk
diff --git a/clientfiles/freepie-udp/license.txt b/contrib/freepie-udp/license.txt
index c40094f2..c40094f2 100644
--- a/clientfiles/freepie-udp/license.txt
+++ b/contrib/freepie-udp/license.txt
diff --git a/clientfiles/freetracktest/freetracktest.exe b/contrib/freetracktest/freetracktest.exe
index 2965a07f..2965a07f 100644
--- a/clientfiles/freetracktest/freetracktest.exe
+++ b/contrib/freetracktest/freetracktest.exe
diff --git a/clientfiles/freetracktest/readme.txt b/contrib/freetracktest/readme.txt
index ca40906f..ca40906f 100644
--- a/clientfiles/freetracktest/readme.txt
+++ b/contrib/freetracktest/readme.txt
diff --git a/clientfiles/fs2002 and fs2004/fsuipc.dll b/contrib/fs2002 and fs2004/fsuipc.dll
index 264d14c5..264d14c5 100644
--- a/clientfiles/fs2002 and fs2004/fsuipc.dll
+++ b/contrib/fs2002 and fs2004/fsuipc.dll
diff --git a/clientfiles/glovepie/facetracknoir2trackir.pie b/contrib/glovepie/facetracknoir2trackir.pie
index d0839e5d..d0839e5d 100644
--- a/clientfiles/glovepie/facetracknoir2trackir.pie
+++ b/contrib/glovepie/facetracknoir2trackir.pie
diff --git a/clientfiles/glovepie/readme.txt b/contrib/glovepie/readme.txt
index 3639e26b..3639e26b 100644
--- a/clientfiles/glovepie/readme.txt
+++ b/contrib/glovepie/readme.txt
diff --git a/clientfiles/ppjoy/ppjoy mapping for facetracknoir.jpg b/contrib/ppjoy/ppjoy mapping for facetracknoir.jpg
index 052c6899..052c6899 100644
--- a/clientfiles/ppjoy/ppjoy mapping for facetracknoir.jpg
+++ b/contrib/ppjoy/ppjoy mapping for facetracknoir.jpg
diff --git a/clientfiles/ppjoy/readme.txt b/contrib/ppjoy/readme.txt
index 20c52111..20c52111 100644
--- a/clientfiles/ppjoy/readme.txt
+++ b/contrib/ppjoy/readme.txt
diff --git a/clientfiles/very-important-source-code/README-CREDIT.txt b/contrib/very-important-source-code/README-CREDIT.txt
index 82214139..82214139 100644
--- a/clientfiles/very-important-source-code/README-CREDIT.txt
+++ b/contrib/very-important-source-code/README-CREDIT.txt
diff --git a/clientfiles/very-important-source-code/ft_tester/Makefile.am b/contrib/very-important-source-code/ft_tester/Makefile.am
index 02747edb..02747edb 100644
--- a/clientfiles/very-important-source-code/ft_tester/Makefile.am
+++ b/contrib/very-important-source-code/ft_tester/Makefile.am
diff --git a/clientfiles/very-important-source-code/ft_tester/Makefile.in b/contrib/very-important-source-code/ft_tester/Makefile.in
index d1fff34d..d1fff34d 100644
--- a/clientfiles/very-important-source-code/ft_tester/Makefile.in
+++ b/contrib/very-important-source-code/ft_tester/Makefile.in
diff --git a/clientfiles/very-important-source-code/ft_tester/fttester.rc.in b/contrib/very-important-source-code/ft_tester/fttester.rc.in
index 332f3c73..332f3c73 100644
--- a/clientfiles/very-important-source-code/ft_tester/fttester.rc.in
+++ b/contrib/very-important-source-code/ft_tester/fttester.rc.in
diff --git a/clientfiles/very-important-source-code/ft_tester/main.cpp b/contrib/very-important-source-code/ft_tester/main.cpp
index a737f88f..a737f88f 100644
--- a/clientfiles/very-important-source-code/ft_tester/main.cpp
+++ b/contrib/very-important-source-code/ft_tester/main.cpp
diff --git a/clientfiles/very-important-source-code/ft_tester/resource.h b/contrib/very-important-source-code/ft_tester/resource.h
index 8bba17b4..8bba17b4 100644
--- a/clientfiles/very-important-source-code/ft_tester/resource.h
+++ b/contrib/very-important-source-code/ft_tester/resource.h
diff --git a/clientfiles/very-important-source-code/important-stuff/NPClient.h b/contrib/very-important-source-code/important-stuff/NPClient.h
index 770e1c71..770e1c71 100644
--- a/clientfiles/very-important-source-code/important-stuff/NPClient.h
+++ b/contrib/very-important-source-code/important-stuff/NPClient.h
diff --git a/clientfiles/very-important-source-code/important-stuff/NPClient.spec b/contrib/very-important-source-code/important-stuff/NPClient.spec
index 7fe5f1b4..7fe5f1b4 100644
--- a/clientfiles/very-important-source-code/important-stuff/NPClient.spec
+++ b/contrib/very-important-source-code/important-stuff/NPClient.spec
diff --git a/clientfiles/very-important-source-code/important-stuff/NPClient_dll.h b/contrib/very-important-source-code/important-stuff/NPClient_dll.h
index b0bab5db..b0bab5db 100644
--- a/clientfiles/very-important-source-code/important-stuff/NPClient_dll.h
+++ b/contrib/very-important-source-code/important-stuff/NPClient_dll.h
diff --git a/clientfiles/very-important-source-code/important-stuff/NPClient_main.c b/contrib/very-important-source-code/important-stuff/NPClient_main.c
index f892f89e..f892f89e 100644
--- a/clientfiles/very-important-source-code/important-stuff/NPClient_main.c
+++ b/contrib/very-important-source-code/important-stuff/NPClient_main.c
diff --git a/clientfiles/very-important-source-code/important-stuff/game_data.c b/contrib/very-important-source-code/important-stuff/game_data.c
index 48774187..48774187 100644
--- a/clientfiles/very-important-source-code/important-stuff/game_data.c
+++ b/contrib/very-important-source-code/important-stuff/game_data.c
diff --git a/clientfiles/very-important-source-code/important-stuff/game_data.h b/contrib/very-important-source-code/important-stuff/game_data.h
index b71f7a15..b71f7a15 100644
--- a/clientfiles/very-important-source-code/important-stuff/game_data.h
+++ b/contrib/very-important-source-code/important-stuff/game_data.h
diff --git a/clientfiles/very-important-source-code/make-csv.pl b/contrib/very-important-source-code/make-csv.pl
index ee60364e..ee60364e 100644
--- a/clientfiles/very-important-source-code/make-csv.pl
+++ b/contrib/very-important-source-code/make-csv.pl
diff --git a/clientfiles/very-important-source-code/npclient.c b/contrib/very-important-source-code/npclient.c
index 3878f809..3878f809 100644
--- a/clientfiles/very-important-source-code/npclient.c
+++ b/contrib/very-important-source-code/npclient.c
diff --git a/clientfiles/very-important-source-code/tester/Makefile.am b/contrib/very-important-source-code/tester/Makefile.am
index e025209a..e025209a 100644
--- a/clientfiles/very-important-source-code/tester/Makefile.am
+++ b/contrib/very-important-source-code/tester/Makefile.am
diff --git a/clientfiles/very-important-source-code/tester/Makefile.in b/contrib/very-important-source-code/tester/Makefile.in
index cc49d754..cc49d754 100644
--- a/clientfiles/very-important-source-code/tester/Makefile.in
+++ b/contrib/very-important-source-code/tester/Makefile.in
diff --git a/clientfiles/very-important-source-code/tester/main.cpp b/contrib/very-important-source-code/tester/main.cpp
index 95ca0d9b..95ca0d9b 100644
--- a/clientfiles/very-important-source-code/tester/main.cpp
+++ b/contrib/very-important-source-code/tester/main.cpp
diff --git a/clientfiles/very-important-source-code/tester/npifc.c b/contrib/very-important-source-code/tester/npifc.c
index b036464e..b036464e 100644
--- a/clientfiles/very-important-source-code/tester/npifc.c
+++ b/contrib/very-important-source-code/tester/npifc.c
diff --git a/clientfiles/very-important-source-code/tester/npifc.h b/contrib/very-important-source-code/tester/npifc.h
index d580e16d..d580e16d 100644
--- a/clientfiles/very-important-source-code/tester/npifc.h
+++ b/contrib/very-important-source-code/tester/npifc.h
diff --git a/clientfiles/very-important-source-code/tester/npview.rc.in b/contrib/very-important-source-code/tester/npview.rc.in
index 231002f1..231002f1 100644
--- a/clientfiles/very-important-source-code/tester/npview.rc.in
+++ b/contrib/very-important-source-code/tester/npview.rc.in
diff --git a/clientfiles/very-important-source-code/tester/resource.h b/contrib/very-important-source-code/tester/resource.h
index 328d9cb7..328d9cb7 100644
--- a/clientfiles/very-important-source-code/tester/resource.h
+++ b/contrib/very-important-source-code/tester/resource.h
diff --git a/clientfiles/vjoy/VJoy.dll b/contrib/vjoy/VJoy.dll
index e3446675..e3446675 100644
--- a/clientfiles/vjoy/VJoy.dll
+++ b/contrib/vjoy/VJoy.dll
diff --git a/ftnoir_tracker_rs/ftnoir_tracker_rs.cpp b/ftnoir_tracker_rs/ftnoir_tracker_rs.cpp
index f17d7fcb..3e9b23c8 100644
--- a/ftnoir_tracker_rs/ftnoir_tracker_rs.cpp
+++ b/ftnoir_tracker_rs/ftnoir_tracker_rs.cpp
@@ -81,7 +81,7 @@ void RSTracker::rsImplProcessFinished(int exitCode){
         msgBox.exec();
 
         if(msgBox.clickedButton() == triggerSdkInstallation){
-            bool pStarted = QProcess::startDetached("clientfiles\\intel_rs_sdk_runtime_websetup_6.0.21.6598.exe --finstall=core,face3d --fnone=all");
+            bool pStarted = QProcess::startDetached("contrib\\intel_rs_sdk_runtime_websetup_6.0.21.6598.exe --finstall=core,face3d --fnone=all");
             if(!pStarted){
                 QMessageBox::warning(0, "Intel® RealSense™ Runtime Installation", "Installation process failed to start.", QMessageBox::Ok);
             }
diff --git a/ftnoir_tracker_rs/ftnoir_tracker_rs_controls.cpp b/ftnoir_tracker_rs/ftnoir_tracker_rs_controls.cpp
index e5187bd1..6c71d58f 100644
--- a/ftnoir_tracker_rs/ftnoir_tracker_rs_controls.cpp
+++ b/ftnoir_tracker_rs/ftnoir_tracker_rs_controls.cpp
@@ -20,7 +20,7 @@ RSTrackerControls::RSTrackerControls()
 
 void RSTrackerControls::doInstallRSRuntime()
 {
-    bool processStarted = QProcess::startDetached("clientfiles\\intel_rs_sdk_runtime_websetup_6.0.21.6598.exe --finstall=core,face3d --fnone=all");
+    bool processStarted = QProcess::startDetached("contrib\\intel_rs_sdk_runtime_websetup_6.0.21.6598.exe --finstall=core,face3d --fnone=all");
     if(processStarted){
         this->close();
     }