Moved some convenience functions to new util module dir