Changed package structure to match owned domain name
Event Handling