types restructuration again