Reorganizing the eventtap module.