Move util.go into separate folder