package restructuration