moved util and mock scripts