move util pkg outside