Separated Out Mouse and Keyboard Events
Altered Package Structure