Moving retry as it's own module