Moved events to their own package (.events)
Updated version
Fixed compile errors