Refactor downloaders and pages