Break util directory into util and ui