Pulling utils into their own package