Move util methods to their own private library