shuffled event code into own ns. some other org.