Issue #32: Avoid cycle between java packages
Issue #40 Refactored the impacted classes after the changes in the event entity classes.
Fixed #41: Copyright notice changed.