Renamed util package + refactoring