Removed extra event classes, made more similar to Commons 2.4
Updated Events to extend commons