Class restructuration