Moved util to an internal pacakge