Azerbaijan thinks again on make-up of economy -