moved files to util/ directory