Some refactoring
Some fixes in the Event Handler

Not actual bugs but stuff that didn't quite make
sense and all
Small improvement in the collision detection
Renamed the header files using the correct ending .hpp