From allocation of investments in risk classes to structuring investments around risk factors