Move util classes to util directory