Maven restructuration