Final move from events class, now all modules are fully independant