Revised util folder