Move utility files to util folder