Move scanner logic in to scanner service