Move parts of the promise chain around in work packages controller