diff --git a/hack/cmd_util.sh b/hack/lib/cmd.sh
similarity index 99%
rename from hack/cmd_util.sh
rename to hack/lib/cmd.sh
index 4ad9a70c4051..9008cb4a8484 100644
--- a/hack/cmd_util.sh
+++ b/hack/lib/cmd.sh
@@ -274,7 +274,7 @@ function os::cmd::internal::determine_caller() {
 	local call_depth=
 	local len_sources="${#BASH_SOURCE[@]}"
 	for (( i=0; i<${len_sources}; i++ )); do
-		if [ ! $(echo "${BASH_SOURCE[i]}" | grep "hack/cmd_util\.sh$") ]; then
+		if [ ! $(echo "${BASH_SOURCE[i]}" | grep "hack/lib/cmd\.sh$") ]; then
 			call_depth=i
 			break
 		fi
diff --git a/hack/lib/init.sh b/hack/lib/init.sh
index bd1b26d7842f..d6adea5cfc80 100644
--- a/hack/lib/init.sh
+++ b/hack/lib/init.sh
@@ -12,9 +12,7 @@ fi
 
 library_files=( $( find "${OS_ROOT}/hack/lib" -type f -name '*.sh' -not -path '*/hack/lib/init.sh' ) )
 # TODO(skuzmets): Move the contents of the following files into respective library files.
-library_files+=( "${OS_ROOT}/hack/cmd_util.sh" )
 library_files+=( "${OS_ROOT}/hack/common.sh" )
-library_files+=( "${OS_ROOT}/hack/text.sh" )
 library_files+=( "${OS_ROOT}/hack/util.sh" )
 
 for library_file in "${library_files[@]}"; do
diff --git a/hack/text.sh b/hack/lib/util/text.sh
similarity index 100%
rename from hack/text.sh
rename to hack/lib/util/text.sh