Refactored structure, improved image locator, event handler, mock api service