Removed unused code
Moved Event and EventDispatcher to the System folder