Move Event into Platform
Remove old file
Minor renaming