diff --git a/clone.sh b/clone.sh
index 8b2c060..536c16a 100755
--- a/clone.sh
+++ b/clone.sh
@@ -29,7 +29,7 @@
 
 set -e
 
-. $(dirname $0)/util_git.sh
+. $(dirname $0)/utils/util_git.sh
 
 # Take into consideration non-CI runs where SHARE_FOLDER variable
 # may not be present
diff --git a/run-build.sh b/run-build.sh
index ffc533e..881f218 100755
--- a/run-build.sh
+++ b/run-build.sh
@@ -13,8 +13,8 @@
 # Expected to have trusted-firmware-m cloned to same level as this git tree
 #
 
-. $(dirname $0)/util_cmake.sh
-. $(dirname $0)/util_git.sh
+. $(dirname $0)/utils/util_cmake.sh
+. $(dirname $0)/utils/util_git.sh
 
 # For dependency that differs from platforms, the versions need to be checkded
 # in each single build job.
diff --git a/run-cppcheck.sh b/run-cppcheck.sh
index 1272a26..604f657 100755
--- a/run-cppcheck.sh
+++ b/run-cppcheck.sh
@@ -69,7 +69,7 @@
 #The cmake_exported project file in json format
 cmake_commands=compile_commands.json
 
-. "$mypath/util_cmake.sh"
+. "$mypath/utils/util_cmake.sh"
 
 #Library file for cppcheck
 library_file="$(fix_win_path $(get_full_path $mypath))/cppcheck/arm-cortex-m.cfg"
diff --git a/util_cmake.sh b/utils/util_cmake.sh
old mode 100755
new mode 100644
similarity index 98%
rename from util_cmake.sh
rename to utils/util_cmake.sh
index 00b91c9..c6ade28
--- a/util_cmake.sh
+++ b/utils/util_cmake.sh
@@ -12,8 +12,8 @@
 ##
 ##This file can be "sourced" from other scripts to get access to variables and functions
 ##defined here.
-##Example \code{.sh}. <path-to-tfm-ci-repo>/util_cmake.sh\endcode
-##or \code{.sh}source <path-to-tfm-ci-repo>/util_cmake.sh\endcode
+##Example \code{.sh}. <path-to-tfm-ci-repo>/utils/util_cmake.sh\endcode
+##or \code{.sh}source <path-to-tfm-ci-repo>/utils/util_cmake.sh\endcode
 ##
 
 ##@fn fix_win_path(string path)
diff --git a/util_git.sh b/utils/util_git.sh
similarity index 100%
rename from util_git.sh
rename to utils/util_git.sh