Move some more jobs to Tools.