Automated event subscription has been implemented.
Restructuring code base