Fixed npm name
Moved util