Adding event and role packages
Merging event and roles package