Reorganization of util package