Moved util file to the common folder (where it belongs)