refactoring: created CollisionEvent, simplified entity tree