Minor refactoring and solved minor bugs. Moved one event class in its correct package.
Authored by: lcrociani 2014-11-13
Parent: [r31040]
Child: [r31042]