Moved util to util directory