Improved system for event subscription.
Deleted duplicate files.