Moved util.go into proper subfolder