move jobs to toplevel
refactor names