restructure on event dispatching system on collisions. Entity and contacts updated