Added EventSources class

and fixing default package