Merge pull request #191 from troopjs/feature/handler

Refactor event handler
Use full package names