Split jobs/builds and refactor a bunch of stuff