Refactored event hooks
Renamed library