Revert "Moved ObjectEvent"

This reverts commit e931bac3344af194f67cd5e437c14f6276807f05.