removed unnecessary utils class and package