Refactor collection fetcher
clean up files