Added other events and cleaned up the packages.