Refactor util package to contain multiple subpackages