Refactored packages, service endpoints completed for events