Move event patches out into separate file