util: Move patch.go into its own package (#535)

util: Move patch.go into its own package (#535) #1624