util files to util/ and renamed includes