Moving work queue related code into own kind