moved most util classes to util package