Reorganized utils package