Class restructuration.