Module restructuration.