package re structured
updated util package