diff --git a/Packaging/Files/selftester.bat b/Packaging/Files/selftester.bat
index 2d164c84b4d45faaf114ad6d9163fb85fce7b7fe..988786829c0f3c9c4b22090cb6fa79dce550d68a 100755
--- a/Packaging/Files/selftester.bat
+++ b/Packaging/Files/selftester.bat
@@ -87,7 +87,7 @@ goto :eof
 :check_binary
 setlocal
 type NUL > tmp.log
-bin\otb_loader.exe %1 > tmp.log 2>&1
+tools\otb_loader.exe %1 > tmp.log 2>&1
 call :nb_tmp_lines
 if %nb_tmp_lines_out% gtr 0 (
   echo ERROR : otb_loader.exe %1
diff --git a/Packaging/Files/uninstall_otb.bat b/Packaging/Files/uninstall_otb.bat
index a4a04280c0c1e9d36175bd4cc17b07cc793fe8c5..070ac5b4f435e65590922552b56497c34df91d2a 100644
--- a/Packaging/Files/uninstall_otb.bat
+++ b/Packaging/Files/uninstall_otb.bat
@@ -1,6 +1,6 @@
 :: uninstall script for OTB
 set CUR_DIR=%~dp0
-cmake -S OUT_DIR/cmake_uninstall_otb.cmake -DMY_INSTALL_DIR=%CUR_DIR% -DCMAKE_COMMAND=cmake
+cmake -S OUT_DIR/tools/cmake_uninstall_otb.cmake -DMY_INSTALL_DIR=%CUR_DIR% -DCMAKE_COMMAND=cmake
 del %CUR_DIR%mapla.bat
 del %CUR_DIR%monteverdi.bat
 echo "OTB is now uninstalled from %CUR_DIR%"
diff --git a/Packaging/Files/uninstall_otb.sh b/Packaging/Files/uninstall_otb.sh
index 11432ed7471bf9b638b6300e170c295a0e764a19..325bb60ec1e065131e06cfb9dc7529656f6d3038 100755
--- a/Packaging/Files/uninstall_otb.sh
+++ b/Packaging/Files/uninstall_otb.sh
@@ -21,7 +21,7 @@
 set -e
 
 CMAKE=$(which cmake)
-$CMAKE -S OUT_DIR/cmake_uninstall_otb.cmake -DMY_INSTALL_DIR=OUT_DIR -DCMAKE_COMMAND=$CMAKE
+$CMAKE -S OUT_DIR/tools/cmake_uninstall_otb.cmake -DMY_INSTALL_DIR=OUT_DIR -DCMAKE_COMMAND=$CMAKE
 rm -f OUT_DIR/mapla.sh
 rm -f OUT_DIR/monteverdi.sh
 echo "OTB is now uninstalled from OUT_DIR"