Move patch into its own file