Moved stuff to the .util package
x