Move fetch* methods into src/fetch