Moved from using utils.sh to common-utils.sh (renamed and changed files)