new structure & pom.xml