Restructured pom files