pom files refactor