Moved event handlers into their own subpackage