Merge "Moved core Job classes under includes/job/jobs."