got rid of util directory