refactor(jobs): rearranging