Cleaned up events

Grouped events should be easier to read now. Now I just need to organize
the sprites