Re-added util package to follow naming conventions