move fetcher into separate directory & add image
merge from origin