Cleaning up EventWrapper and renaming it to CommandEvents to match guzzle/guzzle