Moved util to lib dir