Fixed non-generic bluebird

Changed structure, export to Promise
Merge pull request #1732 from Bartvds/def/bluebird_classic

Fixed non-generic bluebird