Use more OOP

[BenFheng]

Here are the issues
There are these classes that should require some OOP

1. Event
   2.Command