Name refactoring and change in pom structure