Fix up the promise organization