Refactor `fetching` sub-package