Reorganized util directory