moved scala-util into src