created a Jobs package, and refactored