Events

File organization refactoring.

@XavierJp : I can show you how to update your local files if you want.