A bit of restructuration ...