move fetcher classes to their own directory; see #863