Moved util.js to lib