Maven restructruration