Moved util into own subdirectory/namespace.