Moving utils to a seperate package