moved util files into util dir