Job manager restructuring