Feature/epub fetch refactoring

Hi!

These are low-risk refactoring changes to the epub-fetch module.