continue class restructuration