Some small changes before the move of the async job
Isolated the job queue work in its own project