Removed organizing coverage object+event+handler: now: event+handler