Restructuration classes/packages