Added util folder.
Fixed conflicts.