Merge events into same package

Merge the event classes into parent package.
Update javadoc and formatting

Update the javadoc tags to be more useful and fix formatting of methods whin classes.